X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ao_write.c;h=9d204ff3b5220afebbf29efd14d3721411c60b17;hp=bb60e191f4ddb748bbc80aa683c7c8d79fe68122;hb=1775d4d4147730e79e48aa941aee88580b8beb08;hpb=e01b2ffa28b6770cd8771860e1e05b9c75beabd9

diff --git a/ao_write.c b/ao_write.c
index bb60e191..9d204ff3 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <pthread.h>
 #include <ao/ao.h>
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -277,11 +276,10 @@ fail:
 	return -E_AO_PTHREAD;
 }
 
-static void aow_post_select(__a_unused struct sched *s,
+static int aow_post_select(__a_unused struct sched *s,
 		struct task *t)
 {
 	struct writer_node *wn = container_of(t, struct writer_node, task);
-	struct btr_node *btrn = wn->btrn;
 	struct private_aow_data *pawd = wn->private_data;
 	int ret;
 
@@ -289,14 +287,14 @@ static void aow_post_select(__a_unused struct sched *s,
 		int32_t rate, ch, format;
 		struct btr_node_description bnd;
 
-		ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+		ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 		if (ret < 0)
 			goto remove_btrn;
 		if (ret == 0)
-			return;
-		get_btr_sample_rate(btrn, &rate);
-		get_btr_channels(btrn, &ch);
-		get_btr_sample_format(btrn, &format);
+			return 0;
+		get_btr_sample_rate(wn->btrn, &rate);
+		get_btr_channels(wn->btrn, &ch);
+		get_btr_sample_format(wn->btrn, &format);
 		ret = aow_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto remove_btrn;
@@ -304,7 +302,7 @@ static void aow_post_select(__a_unused struct sched *s,
 
 		/* set up thread btr node */
 		bnd.name = "ao_thread_btrn";
-		bnd.parent = btrn;
+		bnd.parent = wn->btrn;
 		bnd.child = NULL;
 		bnd.handler = NULL;
 		bnd.context = pawd;
@@ -314,46 +312,43 @@ static void aow_post_select(__a_unused struct sched *s,
 		ret = aow_create_thread(wn);
 		if (ret < 0)
 			goto remove_thread_btrn;
-		return;
+		return 0;
 	}
 	pthread_mutex_lock(&pawd->mutex);
-	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+	ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 	if (ret > 0) {
-		btr_pushdown(btrn);
+		btr_pushdown(wn->btrn);
 		pthread_cond_signal(&pawd->data_available);
 	}
 	pthread_mutex_unlock(&pawd->mutex);
 	if (ret >= 0)
 		goto out;
 	pthread_mutex_lock(&pawd->mutex);
-	btr_remove_node(btrn);
-	btrn = NULL;
+	btr_remove_node(&wn->btrn);
 	PARA_INFO_LOG("waiting for thread to terminate\n");
 	pthread_cond_signal(&pawd->data_available);
 	pthread_mutex_unlock(&pawd->mutex);
 	pthread_join(pawd->thread, NULL);
 remove_thread_btrn:
-	btr_remove_node(pawd->thread_btrn);
-	btr_free_node(pawd->thread_btrn);
+	btr_remove_node(&pawd->thread_btrn);
 remove_btrn:
-	if (btrn)
-		btr_remove_node(btrn);
+	btr_remove_node(&wn->btrn);
 out:
-	t->error = ret;
+	return ret;
 }
 
-__malloc static void *aow_parse_config_or_die(const char *options)
+__malloc static void *aow_parse_config_or_die(int argc, char **argv)
 {
 	struct ao_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	ao_cmdline_parser_string(options, conf, "ao_write");
+	ao_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void aow_free_config(void *conf)
 {
-	ao_cmdline_parser_free(conf);
+	ao_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -370,13 +365,12 @@ void ao_write_init(struct writer *w)
 	ao_info **driver_list;
 	char **dh; /* detailed help */
 
-	ao_cmdline_parser_init(&dummy);
+	ao_write_cmdline_parser_init(&dummy);
 	w->close = aow_close;
 	w->pre_select = aow_pre_select;
 	w->post_select = aow_post_select;
 	w->parse_config_or_die = aow_parse_config_or_die;
 	w->free_config = aow_free_config;
-	w->shutdown = NULL;
 	w->help = (struct ggo_help) {
 		.short_help = ao_write_args_info_help,
 	};
@@ -417,7 +411,7 @@ void ao_write_init(struct writer *w)
 	}
 	dh[num_lines] = NULL;
 	w->help.detailed_help = (const char **)dh;
-	ao_cmdline_parser_free(&dummy);
+	ao_write_cmdline_parser_free(&dummy);
 	ao_shutdown();
 }