X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=5bcd1f60aa4c430ef1ae35561ffcb40df25cce26;hp=7e6d47a56beb5e827ebbaa7d31cf2560f6b8f49f;hb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6;hpb=3c5c2ebfc2d651f2f77d0df89cbb58a2068bcad0

diff --git a/write.c b/write.c
index 7e6d47a5..5bcd1f60 100644
--- a/write.c
+++ b/write.c
@@ -74,7 +74,7 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
 	cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
 	*cwt->loaded -= WAV_HEADER_LEN;
 	memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded);
-	t->ret = 0;
+	t->ret = -E_WAV_HEADER_SUCCESS;
 	PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate);
 }
 
@@ -83,11 +83,10 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
 	struct initial_delay_task *idt = t->private_data;
 	struct timeval diff;
 
-	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
 	t->ret = -E_NO_DELAY;
 	if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
 		return;
-	t->ret = 0; /* timeout */
+	t->ret = -E_DELAY_TIMEOUT;
 	if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
 		return;
 	t->ret = 1;
@@ -146,6 +145,8 @@ static struct writer_node_group *check_args(void)
 		if (ret < 0)
 			goto out;
 		wng->writer_nodes[i].writer = &writers[ret];
+		sprintf(wng->writer_nodes[i].task.status, "%s",
+			writer_names[ret]);
 	}
 	ret = 1;
 out:
@@ -156,14 +157,16 @@ out:
 	return NULL;
 }
 
-static void idt_error_handler(struct task *t)
+static void idt_event_handler(struct task *t)
 {
-	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
 	int ret;
+
+	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_task(t);
 	wng->buf = sit.buf;
 	wng->loaded = &sit.loaded;
 	wng->eof = &sit.eof;
+	sprintf(wng->task.status, "%s", "writer node group");
 	ret = wng_open(wng);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -171,32 +174,32 @@ static void idt_error_handler(struct task *t)
 	}
 }
 
-static void cwt_error_handler(struct task *t)
+static void cwt_event_handler(struct task *t)
 {
-	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
-	if (t->ret < 0) {
+	if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-		if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_PRE_EOF)
-			exit(EXIT_FAILURE);
-		if (t->ret == -E_PRE_EOF) {
-			conf.channels_arg = cwt.channels;
-			conf.sample_rate_arg = cwt.sample_rate;
-		}
+		exit(EXIT_FAILURE);
 	}
+	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_task(t);
+	if (t->ret == -E_WAV_HEADER_SUCCESS) {
+		conf.channels_arg = cwt.channels;
+		conf.sample_rate_arg = cwt.sample_rate;
+	}
 	idt.task.pre_select = initial_delay_pre_select;
 	idt.task.private_data = &idt;
-	idt.task.error_handler = idt_error_handler;
-	idt.task.flags = PRE_EOF_IS_ERROR;
+	idt.task.event_handler = idt_event_handler;
+	sprintf(idt.task.status, "initial_delay");
 	register_task(&idt.task);
 }
 
-static void stdin_error_handler(struct task *t)
+static void stdin_event_handler(struct task *t)
 {
 	unregister_task(t);
-	PARA_INFO_LOG("task %p, ret: %d\n", t, t->ret);
-	if (t->ret < 0)
+	if (t->ret != -E_STDIN_EOF)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+	else
+		PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
 }
 
 int main(int argc, char *argv[])
@@ -216,18 +219,18 @@ int main(int argc, char *argv[])
 	sit.loaded = 0,
 	sit.task.pre_select = stdin_pre_select;
 	sit.task.post_select = stdin_post_select;
-	sit.task.error_handler = stdin_error_handler;
-	sit.task.flags = POST_EOF_IS_ERROR;
+	sit.task.event_handler = stdin_event_handler;
 	sit.task.private_data = &sit;
+	sprintf(sit.task.status, "stdin reader");
 	register_task(&sit.task);
 
 	cwt.task.pre_select = check_wav_pre_select;
 	cwt.task.private_data = &cwt;
-	cwt.task.error_handler = cwt_error_handler;
+	cwt.task.event_handler = cwt_event_handler;
 	cwt.buf = sit.buf;
 	cwt.loaded = &sit.loaded;
 	cwt.eof = &sit.eof;
-	cwt.task.flags = PRE_EOF_IS_ERROR;
+	sprintf(cwt.task.status, "check wav");
 	register_task(&cwt.task);
 
 	s.default_timeout.tv_sec = 1;