From e8d1185c4221fef9d712c1f375d8e592721b6943 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 7 Jul 2004 00:22:46 +0000 Subject: draining ind native protocol fixes in callback code on object destruction simple protocol git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@52 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pacat.c | 76 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 19 deletions(-) (limited to 'src/pacat.c') diff --git a/src/pacat.c b/src/pacat.c index c69148e6..75a94fc0 100644 --- a/src/pacat.c +++ b/src/pacat.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -6,7 +7,9 @@ #include #include "polyp.h" +#include "polyp-error.h" #include "mainloop.h" +#include "mainloop-signal.h" static struct pa_context *context = NULL; static struct pa_stream *stream = NULL; @@ -17,21 +20,29 @@ static size_t buffer_length = 0, buffer_index = 0; static void* stdin_source = NULL; +static void quit(int ret) { + assert(mainloop_api); + mainloop_api->quit(mainloop_api, ret); +} + static void context_die_callback(struct pa_context *c, void *userdata) { assert(c); fprintf(stderr, "Connection to server shut down, exiting.\n"); - mainloop_api->quit(mainloop_api, 1); + quit(1); } static void stream_die_callback(struct pa_stream *s, void *userdata) { assert(s); fprintf(stderr, "Stream deleted, exiting.\n"); - mainloop_api->quit(mainloop_api, 1); + quit(1); } static void do_write(size_t length) { size_t l; - assert(buffer && buffer_length); + assert(length); + + if (!buffer || !buffer_length) + return; l = length; if (l > buffer_length) @@ -50,8 +61,9 @@ static void do_write(size_t length) { static void stream_write_callback(struct pa_stream *s, size_t length, void *userdata) { assert(s && length); - - mainloop_api->enable_io(mainloop_api, stdin_source, PA_MAINLOOP_API_IO_EVENT_INPUT); + + if (stdin_source) + mainloop_api->enable_io(mainloop_api, stdin_source, PA_MAINLOOP_API_IO_EVENT_INPUT); if (!buffer) return; @@ -63,13 +75,12 @@ static void stream_complete_callback(struct pa_stream*s, int success, void *user assert(s); if (!success) { - fprintf(stderr, "Stream creation failed.\n"); - mainloop_api->quit(mainloop_api, 1); + fprintf(stderr, "Stream creation failed: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s)))); + quit(1); return; } - pa_stream_set_die_callback(s, stream_die_callback, NULL); - pa_stream_set_write_callback(s, stream_write_callback, NULL); + fprintf(stderr, "Stream created.\n"); } static void context_complete_callback(struct pa_context *c, int success, void *userdata) { @@ -82,43 +93,59 @@ static void context_complete_callback(struct pa_context *c, int success, void *u assert(c && !stream); if (!success) { - fprintf(stderr, "Connection failed\n"); + fprintf(stderr, "Connection failed: %s\n", pa_strerror(pa_context_errno(c))); goto fail; } + + fprintf(stderr, "Connection established.\n"); if (!(stream = pa_stream_new(c, PA_STREAM_PLAYBACK, NULL, "pacat", &ss, NULL, stream_complete_callback, NULL))) { - fprintf(stderr, "pa_stream_new() failed.\n"); + fprintf(stderr, "pa_stream_new() failed: %s\n", pa_strerror(pa_context_errno(c))); goto fail; } + pa_stream_set_die_callback(stream, stream_die_callback, NULL); + pa_stream_set_write_callback(stream, stream_write_callback, NULL); + return; fail: - mainloop_api->quit(mainloop_api, 1); + quit(1); +} + +static void context_drain_complete(struct pa_context*c, void *userdata) { + quit(0); } static void stdin_callback(struct pa_mainloop_api*a, void *id, int fd, enum pa_mainloop_api_io_events events, void *userdata) { size_t l, w = 0; ssize_t r; - assert(a == mainloop_api && id && fd == STDIN_FILENO && events == PA_MAINLOOP_API_IO_EVENT_INPUT); + assert(a == mainloop_api && id && fd == STDIN_FILENO && events == PA_MAINLOOP_API_IO_EVENT_INPUT && stdin_source == id); if (buffer) { mainloop_api->enable_io(mainloop_api, stdin_source, PA_MAINLOOP_API_IO_EVENT_NULL); return; } - if (!stream || !(l = w = pa_stream_writable_size(stream))) + if (!stream || !pa_stream_is_ready(stream) || !(l = w = pa_stream_writable_size(stream))) l = 4096; + buffer = malloc(l); assert(buffer); if ((r = read(fd, buffer, l)) <= 0) { - if (r == 0) - mainloop_api->quit(mainloop_api, 0); - else { + if (r == 0) { + fprintf(stderr, "Got EOF.\n"); + if (pa_context_drain(context, context_drain_complete, NULL) < 0) + quit(0); + else + fprintf(stderr, "Draining connection to server.\n"); + } else { fprintf(stderr, "read() failed: %s\n", strerror(errno)); - mainloop_api->quit(mainloop_api, 1); + quit(1); } + mainloop_api->cancel_io(mainloop_api, stdin_source); + stdin_source = NULL; return; } @@ -129,9 +156,15 @@ static void stdin_callback(struct pa_mainloop_api*a, void *id, int fd, enum pa_m do_write(w); } + +static void exit_signal_callback(void *id, int sig, void *userdata) { + fprintf(stderr, "Got SIGINT, exiting.\n"); + quit(0); +} + int main(int argc, char *argv[]) { struct pa_mainloop* m; - int ret = 1; + int ret = 1, r; if (!(m = pa_mainloop_new())) { fprintf(stderr, "pa_mainloop_new() failed.\n"); @@ -140,6 +173,11 @@ int main(int argc, char *argv[]) { mainloop_api = pa_mainloop_get_api(m); + r = pa_signal_init(mainloop_api); + assert(r == 0); + pa_signal_register(SIGINT, exit_signal_callback, NULL); + signal(SIGPIPE, SIG_IGN); + if (!(stdin_source = mainloop_api->source_io(mainloop_api, STDIN_FILENO, PA_MAINLOOP_API_IO_EVENT_INPUT, stdin_callback, NULL))) { fprintf(stderr, "source_io() failed.\n"); goto quit; -- cgit