X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=c29cf3ad472dc56a3b5328d2ca9e85e8ea45e288;hb=08471ab23c0abdf0ddd7ff836a15bd81fbce7520;hp=7293285ef9687ee1c35fd46bfb735a73f6870ec0;hpb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 7293285e..c29cf3ad 100644
--- a/audiod.c
+++ b/audiod.c
@@ -44,8 +44,6 @@ static struct lls_parse_result *lpr;
 #define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name)))
 #define OPT_STRING_VAL(_name) (lls_string_val(0, OPT_RESULT(_name)))
 #define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
-#define ENUM_STRING_VAL(_name) (lls_enum_string_val(OPT_UINT32_VAL(_name), \
-	lls_opt(LSG_AUDIOD_PARA_AUDIOD_OPT_ ## _name, CMD_PTR)))
 
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
 /** define the array containing all supported audio formats */
@@ -123,7 +121,7 @@ enum vss_status_flags {
  * This is needed also in audiod_command.c (for the tasks command), so it can
  * not be made static.
  */
-struct sched sched = {.max_fileno = 0};
+struct sched sched = {.timeout = 0};
 
 /* The task for obtaining para_server's status (para_client stat). */
 struct status_task {
@@ -389,7 +387,7 @@ static void parse_config_or_die(void)
 			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	n = OPT_GIVEN(USER_ALLOW);
 	if (n == 0)
 		return;
@@ -480,6 +478,23 @@ static void close_writers(struct slot_info *s)
 	s->wns = NULL;
 }
 
+static void notify_writers(int error)
+{
+	int i;
+
+	FOR_EACH_SLOT(i) {
+		struct slot_info *s = slot + i;
+		struct audio_format_info *a;
+		int j;
+
+		if (s->format < 0)
+			continue;
+		a = afi + s->format;
+		for (j = 0; j < a->num_writers; j++)
+			task_notify(s->wns[j].task, error);
+	}
+}
+
 static void close_filters(struct slot_info *s)
 {
 	int i;
@@ -567,8 +582,8 @@ static void open_filters(struct slot_info *s)
 		sprintf(buf, "%s (slot %d)", name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
-			.pre_select = f->pre_select,
-			.post_select = f->post_select,
+			.pre_monitor = f->pre_monitor,
+			.post_monitor = f->post_monitor,
 			.context = fn,
 		}, &sched);
 		parent = fn->btrn;
@@ -631,8 +646,8 @@ static int open_receiver(int format)
 		audio_formats[format], name, slot_num);
 	rn->task = task_register(&(struct task_info) {
 		.name = name,
-		.pre_select = r->pre_select,
-		.post_select = r->post_select,
+		.pre_monitor = r->pre_monitor,
+		.post_monitor = r->post_monitor,
 		.context = rn,
 	}, &sched);
 	return slot_num;
@@ -732,8 +747,8 @@ static void compute_time_diff(const struct timeval *status_time)
 	if (count > 5) {
 		int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
 		if (tv_diff(&max_deviation, &tmp, NULL) < 0)
-			PARA_WARNING_LOG("time diff jump: %lums\n",
-				s * tv2ms(&tmp));
+			PARA_WARNING_LOG("time diff jump: %c%lums\n",
+				s < 0? '-' : '+', tv2ms(&tmp));
 	}
 	count++;
 	sa_time_diff_sign = tv_convex_combination(
@@ -1038,7 +1053,7 @@ static void init_local_socket(struct command_task *ct)
 	exit(EXIT_FAILURE);
 }
 
-static int signal_post_select(struct sched *s, void *context)
+static int signal_post_monitor(struct sched *s, void *context)
 {
 	struct signal_task *st = context;
 	int ret, signum;
@@ -1046,25 +1061,25 @@ static int signal_post_select(struct sched *s, void *context)
 	ret = task_get_notification(st->task);
 	if (ret < 0)
 		return ret;
-	signum = para_next_signal(&s->rfds);
+	signum = para_next_signal();
 	switch (signum) {
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
-		PARA_NOTICE_LOG("received signal %d\n", signum);
+		PARA_WARNING_LOG("terminating on signal %d\n", signum);
 		task_notify_all(s, E_AUDIOD_SIGNAL);
 		return -E_AUDIOD_SIGNAL;
 	}
 	return 0;
 }
 
-static void command_pre_select(struct sched *s, void *context)
+static void command_pre_monitor(struct sched *s, void *context)
 {
 	struct command_task *ct = context;
-	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+	sched_monitor_readfd(ct->fd, s);
 }
 
-static int command_post_select(struct sched *s, void *context)
+static int command_post_monitor(struct sched *s, void *context)
 {
 	int ret;
 	struct command_task *ct = context;
@@ -1075,9 +1090,9 @@ static int command_post_select(struct sched *s, void *context)
 	ret = task_get_notification(ct->task);
 	if (ret < 0)
 		return ret;
-	ret = handle_connect(ct->fd, &s->rfds);
+	ret = dispatch_local_connection(ct->fd);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		if (ret == -E_AUDIOD_TERM) {
 			task_notify_all(s, -ret);
 			return ret;
@@ -1115,8 +1130,8 @@ static void init_command_task(struct command_task *ct)
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "command",
-		.pre_select = command_pre_select,
-		.post_select = command_post_select,
+		.pre_monitor = command_pre_monitor,
+		.post_monitor = command_post_monitor,
 		.context = ct,
 	}, &sched);
 }
@@ -1218,8 +1233,9 @@ static void start_stop_decoders(void)
 	struct slot_info *sl;
 
 	close_unused_slots();
-	if (audiod_status != AUDIOD_ON ||
-			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+	if (audiod_status != AUDIOD_ON)
+		return notify_writers(E_NOT_PLAYING);
+	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
 		return notify_receivers(E_NOT_PLAYING);
 	if (!must_start_decoder())
 		return;
@@ -1236,7 +1252,7 @@ static void start_stop_decoders(void)
 	audiod_status_dump(true);
 }
 
-static void status_pre_select(struct sched *s, void *context)
+static void status_pre_monitor(struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	int i, ret, cafn = stat_task->current_audio_format_num;
@@ -1268,7 +1284,7 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static int status_post_select(struct sched *s, void *context)
+static int status_post_monitor(struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	int ret;
@@ -1359,8 +1375,8 @@ static void init_status_task(struct status_task *st)
 
 	stat_task->task = task_register(&(struct task_info) {
 		.name = "stat",
-		.pre_select = status_pre_select,
-		.post_select = status_post_select,
+		.pre_monitor = status_pre_monitor,
+		.post_monitor = status_post_monitor,
 		.context = stat_task,
 	}, &sched);
 }
@@ -1444,7 +1460,7 @@ int main(int argc, char *argv[])
 	ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx));
 	if (ret < 0)
 		goto out;
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
 		OPT_STRING_VAL(GROUP));
 	version_handle_flag("audiod", OPT_GIVEN(VERSION));
@@ -1487,13 +1503,12 @@ int main(int argc, char *argv[])
 
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
-		.pre_select = signal_pre_select,
-		.post_select = signal_post_select,
+		.pre_monitor = signal_pre_monitor,
+		.post_monitor = signal_post_monitor,
 		.context = signal_task,
 	}, &sched);
 
-	sched.default_timeout.tv_sec = 2;
-	sched.default_timeout.tv_usec = 999 * 1000;
+	sched.default_timeout = 2999;
 	ret = schedule(&sched);
 	audiod_cleanup();
 	sched_shutdown(&sched);