[pulseaudio-commits] r1484 - /branches/lennart/src/modules/module-pipe-source.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Thu Jun 14 13:15:07 PDT 2007
Author: lennart
Date: Thu Jun 14 22:15:06 2007
New Revision: 1484
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1484&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Port module-pipe-source to the new threaded design
Modified:
branches/lennart/src/modules/module-pipe-source.c
Modified: branches/lennart/src/modules/module-pipe-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-pipe-source.c?rev=3D1484&root=3Dpulseaudio&r1=3D1483&r2=3D1484&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-pipe-source.c (original)
+++ branches/lennart/src/modules/module-pipe-source.c Thu Jun 14 22:15:06 2=
007
@@ -28,22 +28,22 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <stdio.h>
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
+#include <sys/poll.h>
=
#include <pulse/xmalloc.h>
=
#include <pulsecore/core-error.h>
-#include <pulsecore/iochannel.h>
#include <pulsecore/source.h>
#include <pulsecore/module.h>
#include <pulsecore/core-util.h>
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
+#include <pulsecore/thread.h>
=
#include "module-pipe-source-symdef.h"
=
@@ -58,18 +58,20 @@
"rate=3D<sample rate> "
"channel_map=3D<channel map>")
=
-#define DEFAULT_FIFO_NAME "/tmp/music.input"
+#define DEFAULT_FILE_NAME "/tmp/music.input"
#define DEFAULT_SOURCE_NAME "fifo_input"
=
struct userdata {
pa_core *core;
-
+ pa_module *module;
+ pa_source *source;
+ pa_thread *thread;
+ pa_asyncmsgq *asyncmsgq;
+ =
char *filename;
-
- pa_source *source;
- pa_iochannel *io;
- pa_module *module;
- pa_memchunk chunk;
+ int fd;
+
+ pa_memchunk memchunk;
};
=
static const char* const valid_modargs[] =3D {
@@ -82,65 +84,146 @@
NULL
};
=
-static void do_read(struct userdata *u) {
- ssize_t r;
- void *p;
- pa_memchunk chunk;
-
- assert(u);
-
- if (!pa_iochannel_is_readable(u->io))
- return;
-
- pa_module_set_used(u->module, pa_idxset_size(u->source->outputs));
-
- if (!u->chunk.memblock) {
- u->chunk.memblock =3D pa_memblock_new(u->core->mempool, PIPE_BUF);
- u->chunk.index =3D chunk.length =3D 0;
- }
-
- assert(u->chunk.memblock);
- assert(pa_memblock_get_length(u->chunk.memblock) > u->chunk.index);
-
- p =3D pa_memblock_acquire(u->chunk.memblock);
- if ((r =3D pa_iochannel_read(u->io, (uint8_t*) p + u->chunk.index, pa_=
memblock_get_length(u->chunk.memblock) - u->chunk.index)) <=3D 0) {
- pa_memblock_release(u->chunk.memblock);
- pa_log("read(): %s", pa_cstrerror(errno));
- return;
- }
- pa_memblock_release(u->chunk.memblock);
-
- u->chunk.length =3D r;
- pa_source_post(u->source, &u->chunk);
- u->chunk.index +=3D r;
-
- if (u->chunk.index >=3D pa_memblock_get_length(u->chunk.memblock)) {
- u->chunk.index =3D u->chunk.length =3D 0;
- pa_memblock_unref(u->chunk.memblock);
- u->chunk.memblock =3D NULL;
- }
+static void thread_func(void *userdata) {
+ enum {
+ POLLFD_ASYNCQ,
+ POLLFD_FIFO,
+ POLLFD_MAX,
+ };
+ =
+ struct userdata *u =3D userdata;
+ struct pollfd pollfd[POLLFD_MAX];
+ int read_type =3D 0;
+
+ pa_assert(u);
+
+ pa_log_debug("Thread starting up");
+
+ pa_memchunk_reset(&u->memchunk);
+ =
+ memset(&pollfd, 0, sizeof(pollfd));
+ =
+ pollfd[POLLFD_ASYNCQ].fd =3D pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd[POLLFD_ASYNCQ].events =3D POLLIN;
+ pollfd[POLLFD_FIFO].fd =3D u->fd;
+
+ for (;;) {
+ pa_msgobject *object;
+ int code;
+ void *data;
+ pa_memchunk chunk;
+ int r;
+
+ /* Check whether there is a message for us to process */
+ if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, =
0) =3D=3D 0) {
+ int ret;
+
+ if (!object && code =3D=3D PA_MESSAGE_SHUTDOWN) {
+ pa_asyncmsgq_done(u->asyncmsgq, 0);
+ goto finish;
+ }
+
+ ret =3D pa_asyncmsgq_dispatch(object, code, data, &chunk);
+ pa_asyncmsgq_done(u->asyncmsgq, ret);
+ continue;
+ }
+
+ /* Render some data and write it to the fifo */
+
+ if (u->source->thread_info.state =3D=3D PA_SOURCE_RUNNING && pollf=
d[POLLFD_FIFO].revents) {
+ void *p;
+ ssize_t l;
+ =
+ if (!u->memchunk.memblock) {
+ u->memchunk.memblock =3D pa_memblock_new(u->core->mempool,=
PIPE_BUF);
+ u->memchunk.index =3D u->memchunk.length =3D 0;
+ }
+
+ pa_assert(pa_memblock_get_length(u->memchunk.memblock) > u->me=
mchunk.index);
+ =
+ p =3D pa_memblock_acquire(u->memchunk.memblock);
+ l =3D pa_read(u->fd, (uint8_t*) p + u->memchunk.index, pa_memb=
lock_get_length(u->memchunk.memblock) - u->memchunk.index, &read_type);
+ pa_memblock_release(u->memchunk.memblock);
+
+ pa_assert(l !=3D 0); /* EOF cannot happen, since we opened the=
fifo for both reading and writing */
+
+ if (l < 0) {
+
+ if (errno =3D=3D EINTR)
+ continue;
+ else if (errno !=3D EAGAIN) {
+ pa_log("Faile to read data from FIFO: %s", pa_cstrerro=
r(errno));
+ goto fail;
+ }
+
+ } else {
+ =
+ u->memchunk.length =3D l;
+ pa_source_post(u->source, &u->memchunk);
+ u->memchunk.index +=3D l;
+
+ if (u->memchunk.index >=3D pa_memblock_get_length(u->memch=
unk.memblock)) {
+ pa_memblock_unref(u->memchunk.memblock);
+ pa_memchunk_reset(&u->memchunk);
+ }
+
+ pollfd[POLLFD_FIFO].revents =3D 0;
+ continue;
+ }
+ }
+
+ pollfd[POLLFD_FIFO].events =3D u->source->thread_info.state =3D=3D=
PA_SINK_RUNNING ? POLLIN : 0;
+
+ /* Hmm, nothing to do. Let's sleep */
+
+ if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
+ continue;
+
+/* pa_log("polling for %i", pollfd[POLLFD_FIFO].events); */
+ r =3D poll(pollfd, POLLFD_MAX, -1);
+/* pa_log("polling got %i (r=3D%i) %i", r > 0 ? pollfd[POLLFD_FIFO=
].revents : 0, r, r > 0 ? pollfd[POLLFD_ASYNCQ].revents: 0); */
+
+ pa_asyncmsgq_after_poll(u->asyncmsgq);
+
+ if (r < 0) {
+ if (errno =3D=3D EINTR)
+ continue;
+
+ pa_log("poll() failed: %s", pa_cstrerror(errno));
+ goto fail;
+ }
+
+ if (pollfd[POLLFD_FIFO].revents & ~POLLIN) {
+ pa_log("FIFO shutdown.");
+ goto fail;
+ }
+
+ pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) =3D=3D 0);
+ }
+
+fail:
+ /* We have to continue processing messages until we receive the
+ * SHUTDOWN message */
+ pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_M=
ESSAGE_UNLOAD_MODULE, u->module, NULL, NULL);
+ pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN);
+
+finish:
+ pa_log_debug("Thread shutting down");
}
=
-static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void*userdata) {
- struct userdata *u =3D userdata;
- assert(u);
- do_read(u);
-}
-
int pa__init(pa_core *c, pa_module*m) {
- struct userdata *u =3D NULL;
+ struct userdata *u;
struct stat st;
- const char *p;
- int fd =3D -1;
pa_sample_spec ss;
pa_channel_map map;
- pa_modargs *ma =3D NULL;
+ pa_modargs *ma;
char *t;
=
- assert(c && m);
+ pa_assert(c);
+ pa_assert(m);
=
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
- pa_log("failed to parse module arguments");
+ pa_log("failed to parse module arguments.");
goto fail;
}
=
@@ -150,48 +233,50 @@
goto fail;
}
=
- mkfifo(p =3D pa_modargs_get_value(ma, "file", DEFAULT_FIFO_NAME), 0777=
);
-
- if ((fd =3D open(p, O_RDWR)) < 0) {
- pa_log("open('%s'): %s", p, pa_cstrerror(errno));
- goto fail;
- }
-
- pa_fd_set_cloexec(fd, 1);
-
- if (fstat(fd, &st) < 0) {
- pa_log("fstat('%s'): %s", p, pa_cstrerror(errno));
- goto fail;
- }
-
- if (!S_ISFIFO(st.st_mode)) {
- pa_log("'%s' is not a FIFO.", p);
- goto fail;
- }
-
- u =3D pa_xmalloc0(sizeof(struct userdata));
-
- u->filename =3D pa_xstrdup(p);
+ u =3D pa_xnew0(struct userdata, 1);
u->core =3D c;
-
- if (!(u->source =3D pa_source_new(c, __FILE__, pa_modargs_get_value(ma=
, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) {
- pa_log("failed to create source.");
- goto fail;
- }
- u->source->userdata =3D u;
- pa_source_set_module(u->source, m);
- pa_source_set_description(u->source, t =3D pa_sprintf_malloc("Unix FIF=
O source '%s'", p));
- pa_xfree(t);
-
- u->io =3D pa_iochannel_new(c->mainloop, fd, -1);
- assert(u->io);
- pa_iochannel_set_callback(u->io, io_callback, u);
-
- u->chunk.memblock =3D NULL;
- u->chunk.index =3D u->chunk.length =3D 0;
-
u->module =3D m;
m->userdata =3D u;
+
+ pa_assert_se(u->asyncmsgq =3D pa_asyncmsgq_new(0));
+
+ u->filename =3D pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FI=
LE_NAME));
+ =
+ mkfifo(u->filename, 0666);
+ if ((u->fd =3D open(u->filename, O_RDWR|O_NOCTTY)) < 0) {
+ pa_log("open('%s'): %s", u->filename, pa_cstrerror(errno));
+ goto fail;
+ }
+
+ pa_fd_set_cloexec(u->fd, 1);
+ pa_make_nonblock_fd(u->fd);
+
+ if (fstat(u->fd, &st) < 0) {
+ pa_log("fstat('%s'): %s",u->filename, pa_cstrerror(errno));
+ goto fail;
+ }
+
+ if (!S_ISFIFO(st.st_mode)) {
+ pa_log("'%s' is not a FIFO.", u->filename);
+ goto fail;
+ }
+
+ if (!(u->source =3D pa_source_new(c, __FILE__, pa_modargs_get_value(ma=
, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) {
+ pa_log("Failed to create source.");
+ goto fail;
+ }
+
+ u->source->userdata =3D u;
+ =
+ pa_source_set_module(u->source, m);
+ pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
+ pa_source_set_description(u->source, t =3D pa_sprintf_malloc("Unix FIF=
O source '%s'", u->filename));
+ pa_xfree(t);
+
+ if (!(u->thread =3D pa_thread_new(thread_func, u))) {
+ pa_log("Failed to create thread.");
+ goto fail;
+ }
=
pa_modargs_free(ma);
=
@@ -201,9 +286,6 @@
if (ma)
pa_modargs_free(ma);
=
- if (fd >=3D 0)
- close(fd);
-
pa__done(c, m);
=
return -1;
@@ -211,21 +293,37 @@
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- assert(c && m);
+ =
+ pa_assert(c);
+ pa_assert(m);
=
if (!(u =3D m->userdata))
return;
=
- if (u->chunk.memblock)
- pa_memblock_unref(u->chunk.memblock);
-
- pa_source_disconnect(u->source);
- pa_source_unref(u->source);
- pa_iochannel_free(u->io);
-
- assert(u->filename);
- unlink(u->filename);
- pa_xfree(u->filename);
+ if (u->source)
+ pa_source_disconnect(u->source);
+
+ if (u->thread) {
+ pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, N=
ULL);
+ pa_thread_free(u->thread);
+ }
+
+ if (u->asyncmsgq)
+ pa_asyncmsgq_free(u->asyncmsgq);
+
+ if (u->source)
+ pa_source_unref(u->source);
+ =
+ if (u->memchunk.memblock)
+ pa_memblock_unref(u->memchunk.memblock);
+
+ if (u->filename) {
+ unlink(u->filename);
+ pa_xfree(u->filename);
+ }
+
+ if (u->fd >=3D 0)
+ close(u->fd);
=
pa_xfree(u);
}
More information about the pulseaudio-commits
mailing list