/***
This file is part of PulseAudio.
-
+
+ Copyright 2004-2006 Lennart Poettering
+ Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
-
+
PulseAudio is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
#endif
#include <stdio.h>
-#include <assert.h>
#include <signal.h>
#include <errno.h>
#include <stdlib.h>
#include <windows.h>
#endif
-#include <pulsecore/core-error.h>
#include <pulse/xmalloc.h>
+#include <pulsecore/core-error.h>
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulsecore/gccmacro.h>
+#include <pulsecore/macro.h>
#include "mainloop-signal.h"
#ifndef HAVE_SIGACTION
signal(sig, signal_handler);
#endif
- pa_write(signal_pipe[1], &sig, sizeof(sig));
+ pa_write(signal_pipe[1], &sig, sizeof(sig), NULL);
}
static void dispatch(pa_mainloop_api*a, int sig) {
- pa_signal_event*s;
+ pa_signal_event *s;
- for (s = signals; s; s = s->next)
+ for (s = signals; s; s = s->next)
if (s->sig == sig) {
- assert(s->callback);
+ pa_assert(s->callback);
s->callback(a, s, sig, s->userdata);
break;
}
static void callback(pa_mainloop_api*a, pa_io_event*e, int fd, pa_io_event_flags_t f, PA_GCC_UNUSED void *userdata) {
ssize_t r;
int sig;
- assert(a && e && f == PA_IO_EVENT_INPUT && e == io_event && fd == signal_pipe[0]);
- if ((r = pa_read(signal_pipe[0], &sig, sizeof(sig))) < 0) {
+ pa_assert(a);
+ pa_assert(e);
+ pa_assert(f == PA_IO_EVENT_INPUT);
+ pa_assert(e == io_event);
+ pa_assert(fd == signal_pipe[0]);
+
+ if ((r = pa_read(signal_pipe[0], &sig, sizeof(sig), NULL)) < 0) {
if (errno == EAGAIN)
return;
- pa_log(__FILE__": read(): %s", pa_cstrerror(errno));
+ pa_log("read(): %s", pa_cstrerror(errno));
return;
}
-
+
if (r != sizeof(sig)) {
- pa_log(__FILE__": short read()");
+ pa_log("short read()");
return;
}
int pa_signal_init(pa_mainloop_api *a) {
- assert(!api && a && signal_pipe[0] == -1 && signal_pipe[1] == -1 && !io_event);
+ pa_assert(a);
+ pa_assert(!api);
+ pa_assert(signal_pipe[0] == -1);
+ pa_assert(signal_pipe[1] == -1);
+ pa_assert(!io_event);
if (pipe(signal_pipe) < 0) {
- pa_log(__FILE__": pipe(): %s", pa_cstrerror(errno));
+ pa_log("pipe(): %s", pa_cstrerror(errno));
return -1;
}
- pa_make_nonblock_fd(signal_pipe[0]);
- pa_make_nonblock_fd(signal_pipe[1]);
- pa_fd_set_cloexec(signal_pipe[0], 1);
- pa_fd_set_cloexec(signal_pipe[1], 1);
+ pa_make_fd_nonblock(signal_pipe[0]);
+ pa_make_fd_nonblock(signal_pipe[1]);
+ pa_make_fd_cloexec(signal_pipe[0]);
+ pa_make_fd_cloexec(signal_pipe[1]);
api = a;
- io_event = api->io_new(api, signal_pipe[0], PA_IO_EVENT_INPUT, callback, NULL);
- assert(io_event);
+ pa_assert_se(io_event = api->io_new(api, signal_pipe[0], PA_IO_EVENT_INPUT, callback, NULL));
return 0;
}
void pa_signal_done(void) {
- assert(api && signal_pipe[0] >= 0 && signal_pipe[1] >= 0 && io_event);
+ pa_assert(api);
+ pa_assert(signal_pipe[0] >= 0);
+ pa_assert(signal_pipe[1] >= 0);
+ pa_assert(io_event);
while (signals)
pa_signal_free(signals);
-
+
api->io_free(io_event);
io_event = NULL;
- close(signal_pipe[0]);
- close(signal_pipe[1]);
- signal_pipe[0] = signal_pipe[1] = -1;
+ pa_close_pipe(signal_pipe);
api = NULL;
}
struct sigaction sa;
#endif
- assert(sig > 0 && _callback);
-
+ pa_assert(sig > 0);
+ pa_assert(_callback);
+
for (e = signals; e; e = e->next)
if (e->sig == sig)
goto fail;
-
- e = pa_xmalloc(sizeof(pa_signal_event));
+
+ e = pa_xnew(pa_signal_event, 1);
e->sig = sig;
e->callback = _callback;
e->userdata = userdata;
sa.sa_handler = signal_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
-
+
if (sigaction(sig, &sa, &e->saved_sigaction) < 0)
#else
if ((e->saved_handler = signal(sig, signal_handler)) == SIG_ERR)
}
void pa_signal_free(pa_signal_event *e) {
- assert(e);
+ pa_assert(e);
if (e->next)
e->next->previous = e->previous;
signals = e->next;
#ifdef HAVE_SIGACTION
- sigaction(e->sig, &e->saved_sigaction, NULL);
+ pa_assert_se(sigaction(e->sig, &e->saved_sigaction, NULL) == 0);
#else
- signal(e->sig, e->saved_handler);
+ pa_assert_se(signal(e->sig, e->saved_handler) == signal_handler);
#endif
if (e->destroy_callback)
e->destroy_callback(api, e, e->userdata);
-
+
pa_xfree(e);
}
void pa_signal_set_destroy(pa_signal_event *e, void (*_callback) (pa_mainloop_api *api, pa_signal_event*e, void *userdata)) {
- assert(e);
+ pa_assert(e);
+
e->destroy_callback = _callback;
}