X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=f12dbc1b999a0892abdcea5791692f1f5dfab3c3;hp=687fc5c29107ea2443f25c76562f60488d8aac96;hb=1cccf6fa93c251f8f2805aa5fb163741d851c051;hpb=cd5f0aa2b06b227f519600705fdde2a13f03424d

diff --git a/audiod.c b/audiod.c
index 687fc5c2..f12dbc1b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -5,8 +5,14 @@
  */
 
 /** \file audiod.c The paraslash's audio daemon. */
+
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 #include <signal.h>
 
 #include "para.h"
@@ -1007,7 +1013,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
-		PARA_EMERG_LOG("terminating on signal %d\n", signum);
+		PARA_NOTICE_LOG("received signal %d\n", signum);
 		clean_exit(EXIT_FAILURE, "caught deadly signal");
 	}
 	return 0;
@@ -1031,19 +1037,35 @@ static int command_post_select(struct sched *s, struct task *t)
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
 	static struct timeval last_status_dump;
-	struct timeval tmp, delay = {0, 500 * 1000};
-
-	tv_add(&last_status_dump, &delay, &tmp);
-	if (tv_diff(&tmp, now, NULL) < 0) {
-		audiod_status_dump();
-		last_status_dump = *now;
-	}
+	struct timeval tmp, delay;
+	bool force = true;
 
 	ret = handle_connect(ct->fd, &s->rfds);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-	audiod_status_dump();
-	return 0;
+	else if (ret > 0)
+		goto dump;
+
+	/* if last status dump was less than 500ms ago, do nothing */
+	delay.tv_sec = 0;
+	delay.tv_usec = 500 * 1000;
+	tv_add(&last_status_dump, &delay, &tmp);
+	if (tv_diff(now, &tmp, NULL) < 0)
+		return 0;
+
+	/*
+	 * If last status dump was more than 5s ago, force update. Otherwise,
+	 * update only those items that have changed.
+	 */
+	delay.tv_sec = 5;
+	delay.tv_usec = 0;
+	tv_add(&last_status_dump, &delay, &tmp);
+	if (tv_diff(now, &tmp, NULL) < 0)
+		force = false;
+dump:
+	audiod_status_dump(force);
+	last_status_dump = *now;
+	return 1;
 }
 
 static void init_command_task(struct command_task *ct)
@@ -1066,28 +1088,7 @@ static void close_stat_pipe(void)
 	stat_task->offset_seconds = 0;
 	stat_task->vss_status = 0;
 	stat_task->current_audio_format_num = -1;
-	audiod_status_dump();
-}
-
-/**
- * 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 if
- * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or
- * EXIT_FAILURE.
- *
- * \sa exit(3)
- */
-void __noreturn clean_exit(int status, const char *msg)
-{
-	PARA_EMERG_LOG("%s\n", msg);
-	if (socket_name)
-		unlink(socket_name);
-	close_stat_pipe();
-	exit(status);
+	audiod_status_dump(true);
 }
 
 /* avoid busy loop if server is down */
@@ -1121,20 +1122,51 @@ static bool must_close_slot(int slot_num)
 	return true;
 }
 
+static void close_slot(int slot_num)
+{
+	struct slot_info *s = slot + slot_num;
+
+	PARA_INFO_LOG("closing slot %d\n", slot_num);
+	close_writers(s);
+	close_filters(s);
+	close_receiver(slot_num);
+	clear_slot(slot_num);
+}
+
 static void close_unused_slots(void)
 {
 	int i;
 
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = slot + i;
-		if (!must_close_slot(i))
-			continue;
-		PARA_INFO_LOG("closing slot %d\n", i);
-		close_writers(s);
-		close_filters(s);
-		close_receiver(i);
-		clear_slot(i);
-	}
+	FOR_EACH_SLOT(i)
+		if (must_close_slot(i))
+			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.
+ *
+ * \sa exit(3).
+ */
+void __noreturn clean_exit(int status, const char *msg)
+{
+	int i;
+
+	if (socket_name)
+		unlink(socket_name);
+	close_stat_pipe();
+	FOR_EACH_SLOT(i)
+		close_slot(i);
+	audiod_cmdline_parser_free(&conf);
+	close_stat_clients();
+	PARA_EMERG_LOG("%s\n", msg);
+	exit(status);
 }
 
 /*
@@ -1218,14 +1250,15 @@ static int status_post_select(struct sched *s, struct task *t)
 		char *buf;
 		size_t sz;
 		int ret;
-		if (st->ct->task.error < 0) {
+
+		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
+		if (ret < 0) {
 			close_stat_pipe();
 			goto out;
 		}
 		if (st->ct->status != CL_EXECUTING)
 			goto out;
-		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
-		if (ret <= 0) {
+		if (ret == 0) {
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)