X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=3e86af537431ff67b00a47694fcaa506dea41837;hb=f192fc3c0f824b951c4cb275d7b54b2651de7e8e;hp=fbcde91c9633248886c4a586ccfb7c3dae488584;hpb=27c08870ba172782f6406045007b6ff32a4f7329;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index fbcde91c..3e86af53 100644
--- a/audiod.c
+++ b/audiod.c
@@ -44,12 +44,11 @@ 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 */
-const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
+/* Audio formats supported by audiod */
+static const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY};
+#define NUM_AUDIO_FORMATS ARRAY_SIZE(audio_formats)
 
 /** Defines how audiod handles one supported audio format. */
 struct audio_format_info {
@@ -123,7 +122,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 {
@@ -292,7 +291,7 @@ static int get_play_time_slot_num(void)
  *
  * \return A string that must be freed by the caller.
  */
-char *get_time_string(void)
+__malloc char *get_time_string(void)
 {
 	int ret, seconds = 0, length = stat_task->length_seconds;
 	struct timeval *tmp, sum, sss, /* server stream start */
@@ -389,7 +388,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;
@@ -584,8 +583,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;
@@ -648,8 +647,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;
@@ -830,11 +829,14 @@ static int parse_stream_command(const char *txt, const char **cmd)
 static int add_filter(int format, const char *cmdline)
 {
 	struct audio_format_info *a = &afi[format];
-	int filter_num, nf = a->num_filters;
+	int ret, filter_num, nf = a->num_filters;
 	void *cfg;
 	struct lls_parse_result *flpr;
 
-	filter_num = filter_setup(cmdline, &cfg, &flpr);
+	ret = filter_setup(cmdline, &cfg, &flpr);
+	if (ret < 0)
+		return ret;
+	filter_num = ret;
 	a->filter_lpr = arr_realloc(a->filter_lpr, nf + 1, sizeof(flpr));
 	a->filter_conf = arr_realloc(a->filter_conf, nf + 1, sizeof(void *));
 	a->filter_nums = arr_realloc(a->filter_nums, nf + 1, sizeof(unsigned));
@@ -960,7 +962,7 @@ static int init_default_filters(void)
 		 */
 		if (strcmp(name, "udp") == 0 || strcmp(name, "dccp") == 0) {
 			tmp = para_strdup("fecdec");
-			add_filter(i, tmp);
+			ret = add_filter(i, tmp);
 			free(tmp);
 			if (ret < 0)
 				goto out;
@@ -1052,7 +1054,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;
@@ -1060,7 +1062,7 @@ 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:
@@ -1072,13 +1074,13 @@ static int signal_post_select(struct sched *s, void *context)
 	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;
@@ -1089,7 +1091,7 @@ 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_NOTICE_LOG("%s\n", para_strerror(-ret));
 		if (ret == -E_AUDIOD_TERM) {
@@ -1129,8 +1131,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);
 }
@@ -1251,7 +1253,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;
@@ -1283,7 +1285,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;
@@ -1374,8 +1376,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);
 }
@@ -1459,7 +1461,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));
@@ -1502,13 +1504,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);