There are two ways to terminate para_audiod in a controlled way:
by executing the "term" command and by sending SIGINT or SIGTERM
to the process. Currently both code paths call clean_exit() from
some ->post_select function, which terminates para_audiod by calling
exit(3). Despite the name, this is "unclean" because tasks are not shut
down properly, so not all memory can be freed by this approach. While
this is not a big problem, it makes it more difficult to debug real
memory leaks.
This patch tries to overcome this problem by using notifications to
shut down the audiod tasks. Two new error codes E_AUDIOD_TERM and
E_AUDIOD_SIGNAL are introduced for the notification values. All tasks
are modified to check for notifications and now return the (negative)
notification value from their ->post_select() method if a notification
was received. Hence schedule() returns to main() and we may clean up
the resources allocated by the scheduler by calling sched_shutdown(),
along with the usual cleanup performed by clean_exit(). The latter
function is renamed to audiod_cleanup(), which is more to the point.
para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
-static int signal_post_select(struct sched *s, __a_unused void *context)
+static int signal_post_select(struct sched *s, void *context)
+ struct signal_task *st = context;
+ int ret, signum;
+
+ ret = task_get_notification(st->task);
+ if (ret < 0)
+ return ret;
signum = para_next_signal(&s->rfds);
switch (signum) {
case SIGINT:
case SIGTERM:
case SIGHUP:
PARA_NOTICE_LOG("received signal %d\n", signum);
signum = para_next_signal(&s->rfds);
switch (signum) {
case SIGINT:
case SIGTERM:
case SIGHUP:
PARA_NOTICE_LOG("received signal %d\n", signum);
- clean_exit(EXIT_FAILURE, "caught deadly signal");
+ task_notify_all(s, E_AUDIOD_SIGNAL);
+ return -E_AUDIOD_SIGNAL;
struct timeval tmp, delay;
bool force = true;
struct timeval tmp, delay;
bool force = true;
- ret = handle_connect(ct->fd, &s->rfds);
+ ret = task_get_notification(ct->task);
+ return ret;
+ ret = handle_connect(ct->fd, &s->rfds);
+ if (ret < 0) {
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ if (ret == -E_AUDIOD_TERM) {
+ task_notify_all(s, -ret);
+ return ret;
+ }
+ } else if (ret > 0)
goto dump;
/* if last status dump was less than 500ms ago, do nothing */
goto dump;
/* if last status dump was less than 500ms ago, do nothing */
-/**
- * Close the connection to para_server and exit.
- *
- * \param status The exit status which is passed to exit(3).
- * \param msg The log message
- *
- * Log \a msg with loglevel \p EMERG, close the connection to para_server and
- * all slots, and call \p exit(status). \a status should be either EXIT_SUCCESS
- * or EXIT_FAILURE.
+/*
+ * Cleanup all resources.
+ * This performs various cleanups, removes the audiod socket and closes the
+ * connection to para_server.
-void __noreturn clean_exit(int status, const char *msg)
+static void audiod_cleanup(void)
{
if (socket_name)
unlink(socket_name);
{
if (socket_name)
unlink(socket_name);
close_unused_slots();
audiod_cmdline_parser_free(&conf);
close_stat_clients();
close_unused_slots();
audiod_cmdline_parser_free(&conf);
close_stat_clients();
- PARA_EMERG_LOG("%s\n", msg);
- exit(status);
static int status_post_select(struct sched *s, void *context)
{
struct status_task *st = context;
static int status_post_select(struct sched *s, void *context)
{
struct status_task *st = context;
+ ret = task_get_notification(st->task);
+ if (ret < 0)
+ return ret;
if (audiod_status == AUDIOD_OFF) {
if (!st->ct)
goto out;
if (audiod_status == AUDIOD_OFF) {
if (!st->ct)
goto out;
if (st->ct) {
char *buf;
size_t sz;
if (st->ct) {
char *buf;
size_t sz;
ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
if (ret < 0) {
ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
if (ret < 0) {
sched.default_timeout.tv_sec = 2;
sched.default_timeout.tv_usec = 999 * 1000;
ret = schedule(&sched);
sched.default_timeout.tv_sec = 2;
sched.default_timeout.tv_usec = 999 * 1000;
ret = schedule(&sched);
- PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- return EXIT_FAILURE;
+ if (ret < 0)
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
return grab_client_new(fd, argc, argv, &sched);
}
return grab_client_new(fd, argc, argv, &sched);
}
-__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
- clean_exit(EXIT_SUCCESS, "terminating on user request");
}
static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
}
static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
PARA_ERROR(NOT_PLAYING, "not playing"), \
PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
PARA_ERROR(NOT_PLAYING, "not playing"), \
PARA_ERROR(AUDIOD_OFF, "audiod switched off"), \
PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \
+ PARA_ERROR(AUDIOD_SIGNAL, "caught deadly signal"), \
+ PARA_ERROR(AUDIOD_TERM, "terminating on user request"), \
#define AUDIOD_COMMAND_ERRORS \
#define AUDIOD_COMMAND_ERRORS \