X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=5ef5778107e22dd44e44402f2961cc0f6192a594;hp=4f2d4151b58cf62e980c4f61c94c8ca1e1923297;hb=1ff4b2cba04db47b59cc3da23c4245d14d697638;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9

diff --git a/audiod.c b/audiod.c
index 4f2d4151..5ef57781 100644
--- a/audiod.c
+++ b/audiod.c
@@ -343,10 +343,11 @@ static void parse_config_or_die(void)
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
 		goto err;
 	}
-	if (ret)
+	if (ret) {
 		audiod_cmdline_parser_config_file(config_file, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
+	}
 	free(config_file);
-	daemon_set_loglevel(conf.loglevel_arg);
 	return;
 err:
 	free(config_file);
@@ -427,7 +428,7 @@ static void close_filters(struct slot_info *s)
 	struct audio_format_info *a = afi + s->format;
 	if (a->num_filters == 0)
 		return;
-	for (i = 0; i < a->num_filters; i++) {
+	for (i = a->num_filters - 1; i >= 0; i--) {
 		struct filter_node *fn = s->fns + i;
 		struct filter *f;
 
@@ -496,7 +497,6 @@ static void open_filters(struct slot_info *s)
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
 		fn->task.post_select = f->post_select;
-
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
@@ -520,12 +520,13 @@ static void open_writers(struct slot_info *s)
 	assert(s->wns == NULL);
 	s->wns = para_calloc(PARA_MAX(1U, a->num_writers)
 		* sizeof(struct writer_node));
-	PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
 	for (i = 0; i < a->num_writers; i++) {
 		wn = s->wns + i;
 		wn->conf = a->writer_conf[i];
 		wn->writer_num = a->writer_nums[i];
 		register_writer_node(wn, parent, &sched);
+		PARA_NOTICE_LOG("%s writer started in slot %d\n",
+			writer_names[a->writer_nums[i]], (int)(s - slot));
 	}
 }
 
@@ -914,7 +915,7 @@ out:
 
 static int parse_filter_args(void)
 {
-	int i, j, ret, af_mask;
+	int i, j, ret, af_mask, num_matches;
 
 	for (i = 0; i < conf.filter_given; i++) {
 		char *arg;
@@ -922,13 +923,18 @@ static int parse_filter_args(void)
 		if (ret < 0)
 			goto out;
 		af_mask = ret;
+		num_matches = 0;
 		FOR_EACH_AUDIO_FORMAT(j) {
 			if ((af_mask & (1 << j)) == 0) /* no match */
 				continue;
 			ret = add_filter(j, arg);
 			if (ret < 0)
 				goto out;
+			num_matches++;
 		}
+		if (num_matches == 0)
+			PARA_WARNING_LOG("ignoring filter spec: %s\n",
+				conf.filter_arg[i]);
 	}
 	ret = init_default_filters(); /* use default values for the rest */
 out:
@@ -992,7 +998,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
 {
 	int signum;
 
@@ -1001,9 +1007,10 @@ static void 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;
 }
 
 static void signal_setup_default(struct signal_task *st)
@@ -1019,23 +1026,40 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+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();
+	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)
@@ -1058,28 +1082,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 */
@@ -1089,27 +1092,34 @@ static void set_stat_task_restart_barrier(unsigned seconds)
 	tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
-static void try_to_close_slot(int slot_num)
+static bool must_close_slot(int slot_num)
 {
 	struct slot_info *s = &slot[slot_num];
 	struct audio_format_info *a = afi + s->format;
 	int i;
 
 	if (s->format < 0)
-		return;
+		return false;
 	if (s->receiver_node && s->receiver_node->task.error >= 0)
-		return;
+		return false;
 	for (i = 0; i < a->num_filters; i++)
 		if (s->fns && s->fns[i].task.error >= 0)
-			return;
+			return false;
 	if (a->num_writers > 0) {
 		for (i = 0; i < a->num_writers; i++)
 			if (s->wns && s->wns[i].task.error >= 0)
-				return;
+				return false;
 	} else {
 		if (s->wns && s->wns[0].task.error >= 0)
-			return;
+			return false;
 	}
+	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);
@@ -1117,18 +1127,53 @@ static void try_to_close_slot(int slot_num)
 	clear_slot(slot_num);
 }
 
+static void close_unused_slots(void)
+{
+	int 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);
+}
+
 /*
  * Check if any receivers/filters/writers need to be started and do so if
  * necessary.
  */
 static void start_stop_decoders(void)
 {
-	int i, ret;
+	int ret;
 	struct slot_info *sl;
 	struct audio_format_info *a;
 
-	FOR_EACH_SLOT(i)
-		try_to_close_slot(i);
+	close_unused_slots();
 	if (audiod_status != AUDIOD_ON ||
 			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
 		return notify_receivers(E_NOT_PLAYING);
@@ -1151,10 +1196,13 @@ static void start_stop_decoders(void)
 static void status_pre_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
-	int ret, cafn = stat_task->current_audio_format_num;
+	int i, ret, cafn = stat_task->current_audio_format_num;
 
 	if (must_start_decoder())
 		goto min_delay;
+	FOR_EACH_SLOT(i)
+		if (must_close_slot(i))
+			goto min_delay;
 	ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 	if (ret > 0)
 		goto min_delay;
@@ -1177,7 +1225,7 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static void status_post_select(struct sched *s, struct task *t)
+static int status_post_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
 
@@ -1196,25 +1244,26 @@ static void 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_RECEIVING)
+		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)
-				task_notify(&st->ct->task, E_AUDIOD_OFF);
+				task_notify(&st->ct->task, E_STATUS_TIMEOUT);
 			goto out;
 		}
 		btr_merge(st->btrn, st->min_iqs);
 		sz = btr_next_buffer(st->btrn, &buf);
 		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
-			task_notify(&st->ct->task, E_AUDIOD_OFF);
+			task_notify(&st->ct->task, -ret);
 			goto out;
 		}
 		if (sz != ret) {
@@ -1250,6 +1299,7 @@ static void status_post_select(struct sched *s, struct task *t)
 	st->last_status_read = *now;
 out:
 	start_stop_decoders();
+	return 0;
 }
 
 static void init_status_task(struct status_task *st)
@@ -1284,18 +1334,17 @@ static void set_initial_status(void)
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? audiod_args_info_detailed_help
-		: audiod_args_info_help;
-
-	printf_or_die("%s\n\n", AUDIOD_CMDLINE_PARSER_PACKAGE "-"
-		AUDIOD_CMDLINE_PARSER_VERSION);
-	printf_or_die("%s\n\n", audiod_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_receiver_helps(d);
-	print_filter_helps(d);
-	print_writer_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(audiod);
+	bool d = conf.detailed_help_given;
+	unsigned flags;
+
+	flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
+	ggo_print_help(&h, flags);
+
+	flags = d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS;
+	print_receiver_helps(flags);
+	print_filter_helps(flags);
+	print_writer_helps(flags);
 	exit(0);
 }
 
@@ -1334,9 +1383,9 @@ int main(int argc, char *argv[])
 	};
 
 	valid_fd_012();
-	if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
-	HANDLE_VERSION_FLAG("audiod", conf);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
+	daemon_set_loglevel(conf.loglevel_arg);
+	version_handle_flag("audiod", conf.version_given);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
 	filter_init();