X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=3deef1474c840a48e88d4db6717b0d446a1e994b;hp=453824ace679f97feaa24c0d74b61ebdd83b049f;hb=3879481ddabc38236b9eee979a090c2a9bfa74d3;hpb=1af65c31171b35e5a5e931e3a4467786e932e145

diff --git a/write.c b/write.c
index 453824ac..3deef147 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,14 +75,37 @@ static void setup_writer_node(const char *arg, struct btr_node *parent,
 	register_writer_node(wn, parent, s);
 }
 
+struct write_task {
+	struct task task;
+	struct check_wav_context *cwc;
+};
+
+static void write_pre_select(struct sched *s, struct task *t)
+{
+	struct write_task *wt = container_of(t, struct write_task, task);
+	check_wav_pre_select(s, wt->cwc);
+}
+
+static void write_post_select(__a_unused struct sched *s, struct task *t)
+{
+	struct write_task *wt = container_of(t, struct write_task, task);
+	t->error = check_wav_post_select(wt->cwc);
+}
+
 static int setup_and_schedule(void)
 {
 	int i, ret;
-	struct check_wav_task *cwt;
-	struct btr_node *cwt_btrn;
+	struct btr_node *cw_btrn;
 	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",
+		},
+	};
 
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	sit.btrn = btr_new_node(&(struct btr_node_description)
@@ -91,15 +114,16 @@ static int setup_and_schedule(void)
 	register_task(&s, &sit.task);
 
 	COPY_WAV_PARMS(&wp, &conf);
-	cwt = check_wav_init(&s, sit.btrn, &wp, &cwt_btrn);
+	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
+	register_task(&s, &wt.task);
 	if (!conf.writer_given) {
 		wns = para_calloc(sizeof(*wns));
-		setup_writer_node(NULL, cwt_btrn, wns, &s);
+		setup_writer_node(NULL, cw_btrn, wns, &s);
 		i = 1;
 	} else {
 		wns = para_calloc(conf.writer_given * sizeof(*wns));
 		for (i = 0; i < conf.writer_given; i++)
-			setup_writer_node(conf.writer_arg[i], cwt_btrn,
+			setup_writer_node(conf.writer_arg[i], cw_btrn,
 				wns + i, &s);
 	}
 
@@ -130,7 +154,7 @@ static int setup_and_schedule(void)
 		free(wn->conf);
 	}
 	free(wns);
-	check_wav_shutdown(cwt);
+	check_wav_shutdown(wt.cwc);
 	return ret;
 }