X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=b3f103e97d4ae1c5e1f84c6fe2de8bb1bac70df3;hp=0be4a783cfb196a8b8b66f43c00a91abca578c54;hb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hpb=0eb69b6d45c54deda1724b2db2202cf4057b0309

diff --git a/write.c b/write.c
index 0be4a783..b3f103e9 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,16 +35,11 @@ INIT_STDERR_LOGGING(loglevel)
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? write_args_info_detailed_help
-		: write_args_info_help;
-
-	printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
-		WRITE_CMDLINE_PARSER_VERSION);
-	printf_or_die("%s\n\n", write_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_writer_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(write);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_writer_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
 	exit(0);
 }
 
@@ -76,20 +71,20 @@ static void setup_writer_node(const char *arg, struct btr_node *parent,
 }
 
 struct write_task {
-	struct task task;
+	struct task *task;
 	struct check_wav_context *cwc;
 };
 
-static void write_pre_select(struct sched *s, struct task *t)
+static void write_pre_select(struct sched *s, void *context)
 {
-	struct write_task *wt = container_of(t, struct write_task, task);
+	struct write_task *wt = context;
 	check_wav_pre_select(s, wt->cwc);
 }
 
-static void write_post_select(__a_unused struct sched *s, struct task *t)
+static int write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct write_task *wt = container_of(t, struct write_task, task);
-	t->error = check_wav_post_select(wt->cwc);
+	struct write_task *wt = context;
+	return check_wav_post_select(wt->cwc);
 }
 
 static int setup_and_schedule(void)
@@ -99,23 +94,20 @@ static int setup_and_schedule(void)
 	struct writer_node *wns;
 	static struct sched s;
 	struct wav_params wp;
-	struct write_task wt = {
-		.task = {
-			.pre_select = write_pre_select,
-			.post_select = write_post_select,
-			.status = "write task",
-		},
-	};
+	struct write_task wt;
 
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	sit.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	stdin_set_defaults(&sit);
-	register_task(&s, &sit.task);
+	stdin_task_register(&sit, &s);
 
 	COPY_WAV_PARMS(&wp, &conf);
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
-	register_task(&s, &wt.task);
+	wt.task = task_register(&(struct task_info) {
+		.name = "write",
+		.pre_select = write_pre_select,
+		.post_select = write_post_select,
+		.context = &wt,
+	}, &s);
 	if (!conf.writer_given) {
 		wns = para_calloc(sizeof(*wns));
 		setup_writer_node(NULL, cw_btrn, wns, &s);
@@ -131,16 +123,17 @@ static int setup_and_schedule(void)
 	s.default_timeout.tv_usec = 50000;
 	ret = schedule(&s);
 	if (ret >= 0) {
-		int j;
+		int j, ts;
 		for (j = 0; j < i; j++) {
-			struct task *t = &wns[j].task;
-			assert(t->error < 0);
-			if (t->error != -E_WRITE_COMMON_EOF
-					&& t->error != -E_BTR_EOF) {
-				PARA_ERROR_LOG("%s: %s\n", t->status,
-					para_strerror(-t->error));
+			struct writer_node *wn = wns + j;
+			ts = task_status(wn->task);
+			assert(ts < 0);
+			if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
+				const char *name = writer_names[wn->writer_num];
+				PARA_ERROR_LOG("%s: %s\n", name,
+					para_strerror(-ts));
 				if (ret >= 0)
-					ret = t->error;
+					ret = ts;
 			}
 		}
 	}
@@ -155,6 +148,7 @@ static int setup_and_schedule(void)
 	}
 	free(wns);
 	check_wav_shutdown(wt.cwc);
+	sched_shutdown(&s);
 	return ret;
 }
 
@@ -173,9 +167,10 @@ int main(int argc, char *argv[])
 {
 	int ret;
 
-	writer_init();
 	write_cmdline_parser(argc, argv, &conf);
-	HANDLE_VERSION_FLAG("write", conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	writer_init();
+	version_handle_flag("write", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();