X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write.c;h=cb32d391eaa0f856414aa23318a7573def0d9eef;hb=205423874c2dcc43c1def1ab80e40c8bac0e3f30;hp=356f35d46c04114881cb2b5516920e2d213b4e0d;hpb=8a9e379465d2f60cec5ff91811db1eb661e4c9e3;p=paraslash.git

diff --git a/write.c b/write.c
index 356f35d4..cb32d391 100644
--- a/write.c
+++ b/write.c
@@ -54,16 +54,16 @@ struct write_task {
 	struct check_wav_context *cwc;
 };
 
-static void write_pre_select(struct sched *s, void *context)
+static void write_pre_monitor(struct sched *s, void *context)
 {
 	struct write_task *wt = context;
-	check_wav_pre_select(s, wt->cwc);
+	check_wav_pre_monitor(s, wt->cwc);
 }
 
-static int write_post_select(__a_unused struct sched *s, void *context)
+static int write_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct write_task *wt = context;
-	return check_wav_post_select(wt->cwc);
+	return check_wav_post_monitor(wt->cwc);
 }
 
 static int setup_and_schedule(struct lls_parse_result *lpr)
@@ -83,8 +83,8 @@ static int setup_and_schedule(struct lls_parse_result *lpr)
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
 	wt.task = task_register(&(struct task_info) {
 		.name = "write",
-		.pre_select = write_pre_select,
-		.post_select = write_post_select,
+		.pre_monitor = write_pre_monitor,
+		.post_monitor = write_post_monitor,
 		.context = &wt,
 	}, &s);
 
@@ -96,8 +96,7 @@ static int setup_and_schedule(struct lls_parse_result *lpr)
 		wns[i].wid = check_writer_arg_or_die(arg, &wns[i].lpr);
 		register_writer_node(wns + i, cw_btrn, &s);
 	}
-	s.default_timeout.tv_sec = 10;
-	s.default_timeout.tv_usec = 50000;
+	s.default_timeout = 10500;
 	ret = schedule(&s);
 	if (ret >= 0) {
 		int j, ts;
@@ -105,7 +104,7 @@ static int setup_and_schedule(struct lls_parse_result *lpr)
 			struct writer_node *wn = wns + j;
 			ts = task_status(wn->task);
 			assert(ts < 0);
-			if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
+			if (ts != -E_EOF) {
 				const char *name = writer_name(wn->wid);
 				PARA_ERROR_LOG("%s: %s\n", name,
 					para_strerror(-ts));