X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=f8eeccee395a0a01a0fdd512e0449433c5b0da93;hp=6fd101a093b2f7f94abe43cab0331781c8a57a3a;hb=8b71176b792089c47acc788e1c1e068e9375fd18;hpb=0879c9de4eaf8c78131c243d8e9fec013df0d14a

diff --git a/audiod.c b/audiod.c
index 6fd101a0..f8eeccee 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -390,6 +390,7 @@ static void close_receiver(int slot_num)
 	task_reap(&s->receiver_node->task);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
+	stat_task->current_audio_format_num = -1;
 	tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
 		&a->restart_barrier);
 }
@@ -1006,16 +1007,22 @@ static void signal_pre_select(struct sched *s, void *context)
 	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)
 {
-	int signum;
+	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);
-		clean_exit(EXIT_FAILURE, "caught deadly signal");
+		task_notify_all(s, E_AUDIOD_SIGNAL);
+		return -E_AUDIOD_SIGNAL;
 	}
 	return 0;
 }
@@ -1034,10 +1041,17 @@ static int command_post_select(struct sched *s, void *context)
 	struct timeval tmp, delay;
 	bool force = true;
 
-	ret = handle_connect(ct->fd, &s->rfds);
+	ret = task_get_notification(ct->task);
 	if (ret < 0)
+		return ret;
+	ret = handle_connect(ct->fd, &s->rfds);
+	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-	else if (ret > 0)
+		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 */
@@ -1140,19 +1154,13 @@ static void close_unused_slots(void)
 			close_slot(i);
 }
 
-/**
- * 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.
  *
- * \sa exit(3).
+ * 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);
@@ -1160,8 +1168,6 @@ void __noreturn clean_exit(int status, const char *msg)
 	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
-	PARA_EMERG_LOG("%s\n", msg);
-	exit(status);
 }
 
 /*
@@ -1226,7 +1232,11 @@ min_delay:
 static int status_post_select(struct sched *s, void *context)
 {
 	struct status_task *st = context;
+	int ret;
 
+	ret = task_get_notification(st->task);
+	if (ret < 0)
+		return ret;
 	if (audiod_status == AUDIOD_OFF) {
 		if (!st->ct)
 			goto out;
@@ -1241,7 +1251,6 @@ static int status_post_select(struct sched *s, void *context)
 	if (st->ct) {
 		char *buf;
 		size_t sz;
-		int ret;
 
 		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 		if (ret < 0) {
@@ -1394,7 +1403,7 @@ int main(int argc, char *argv[])
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	init_colors_or_die();
 	init_random_seed_or_die();
@@ -1412,8 +1421,8 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	log_welcome("para_audiod");
-	set_server_start_time(NULL);
+	daemon_log_welcome("para_audiod");
+	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)
 		clear_slot(i);
@@ -1435,8 +1444,10 @@ int main(int argc, char *argv[])
 	sched.default_timeout.tv_sec = 2;
 	sched.default_timeout.tv_usec = 999 * 1000;
 	ret = schedule(&sched);
+	audiod_cleanup();
 	sched_shutdown(&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;
 }