X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=119adbc0be2ddbf24a7d06de4b77a5a3d88bd230;hp=1dc70e5e3fa0dc107920de755a1b6f99b35f31a1;hb=HEAD;hpb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed

diff --git a/audiod.c b/audiod.c
index 1dc70e5e..7c223995 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 {
@@ -292,7 +290,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,11 +387,11 @@ 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;
-	uid_whitelist = para_malloc(n * sizeof(uid_t));
+	uid_whitelist = arr_alloc(n, sizeof(uid_t));
 	for (i = 0; i < n; i++) {
 		const char *arg = lls_string_val(i, OPT_RESULT(USER_ALLOW));
 		int32_t val;
@@ -564,7 +562,7 @@ static void open_filters(struct slot_info *s)
 		return;
 	PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
 	assert(s->fns == NULL);
-	s->fns = para_calloc(nf * sizeof(struct filter_node));
+	s->fns = zalloc(nf * sizeof(struct filter_node));
 	parent = s->receiver_node->btrn;
 	for (i = 0; i < nf; i++) {
 		char buf[20];
@@ -584,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;
@@ -602,7 +600,7 @@ static void open_writers(struct slot_info *s)
 	struct btr_node *parent = s->fns[a->num_filters - 1].btrn;
 
 	assert(s->wns == NULL);
-	s->wns = para_calloc(PARA_MAX(1U, a->num_writers)
+	s->wns = zalloc(PARA_MAX(1U, a->num_writers)
 		* sizeof(struct writer_node));
 	for (i = 0; i < a->num_writers; i++) {
 		wn = s->wns + i;
@@ -629,7 +627,7 @@ static int open_receiver(int format)
 	if (ret < 0)
 		return ret;
 	slot_num = ret;
-	rn = para_calloc(sizeof(*rn));
+	rn = zalloc(sizeof(*rn));
 	rn->receiver = r;
 	rn->lpr = a->receiver_lpr;
 	rn->btrn = btr_new_node(&(struct btr_node_description)
@@ -648,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;
@@ -819,7 +817,7 @@ static int parse_stream_command(const char *txt, const char **cmd)
 		return -E_MISSING_COLON;
 	*cmd = p + 1;
 	len = p - txt;
-	re = para_malloc(len + 1);
+	re = alloc(len + 1);
 	strncpy(re, txt, len);
 	re[len] = '\0';
 	ret = get_matching_audio_format_nums(re);
@@ -835,12 +833,9 @@ static int add_filter(int format, const char *cmdline)
 	struct lls_parse_result *flpr;
 
 	filter_num = filter_setup(cmdline, &cfg, &flpr);
-	a->filter_lpr = para_realloc(a->filter_lpr,
-		(nf + 1) * sizeof(flpr));
-	a->filter_conf = para_realloc(a->filter_conf,
-		(nf + 1) * sizeof(void *));
-	a->filter_nums = para_realloc(a->filter_nums,
-		(nf + 1) * sizeof(unsigned));
+	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));
 
 	a->filter_nums[nf] = filter_num;
 	a->filter_conf[nf] = cfg;
@@ -886,8 +881,8 @@ static int parse_writer_args(void)
 		if (a->num_writers > 0)
 			continue; /* already set up */
 		a->num_writers = 1;
-		a->wids = para_malloc(sizeof(int));
-		a->writer_lpr = para_malloc(sizeof(struct lls_parse_result *));
+		a->wids = alloc(sizeof(int));
+		a->writer_lpr = alloc(sizeof(struct lls_parse_result *));
 		a->wids[0] = check_writer_arg_or_die(NULL, a->writer_lpr);
 		PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
 			writer_name(a->wids[0]));
@@ -963,7 +958,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;
@@ -1055,7 +1050,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;
@@ -1075,13 +1070,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;
 	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;
@@ -1132,8 +1127,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);
 }
@@ -1254,7 +1249,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;
@@ -1286,7 +1281,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;
@@ -1377,8 +1372,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);
 }
@@ -1462,7 +1457,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));
@@ -1505,8 +1500,8 @@ 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);