X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write_common.c;h=6c0faa7c18fb70c5421426bd81be0e207a41bc54;hb=899a19c03fc05f6fd98687e3eaa86841a4633a10;hp=2cb0eafd45437d58fd79f988a6757fd41a69d7eb;hpb=0610638110061ff05670a6c497b371bf2e1d4d0f;p=paraslash.git

diff --git a/write_common.c b/write_common.c
index 2cb0eafd..6c0faa7c 100644
--- a/write_common.c
+++ b/write_common.c
@@ -45,8 +45,8 @@ static void wng_post_select(struct sched *s, struct task *t)
 			min_written = PARA_MIN(min_written, t->ret);
 	}
 	*g->loaded -= min_written;
-	if (!*g->loaded && *g->eof)
-		t->ret = 0;
+	if (!*g->loaded && *g->input_eof)
+		t->ret = -E_WNG_EOF;
 	else
 		t->ret = 1;
 	if (*g->loaded && min_written)
@@ -70,9 +70,10 @@ int wng_open(struct writer_node_group *g)
 		wn->task.pre_select = wn->writer->pre_select;
 		wn->task.post_select = wn->writer->post_select;
 		wn->task.private_data = wn;
-		wn->task.flags = POST_EOF_IS_ERROR;
 		register_task(&wn->task);
 	}
+	sprintf(g->task.status, "%s", "writer node group");
+	g->eof = 0;
 	register_task(&g->task);
 out:
 	return ret;
@@ -98,11 +99,11 @@ void wng_close(struct writer_node_group *g)
 	}
 }
 
-static void wng_error_handler(struct task *t)
+static void wng_event_handler(struct task *t)
 {
 	struct writer_node_group *g = t->private_data;
 
-	PARA_INFO_LOG("%p: ret = %d\n", t, t->ret);
+	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_task(t);
 	wng_close(g);
 	wng_destroy(g);
@@ -117,8 +118,8 @@ struct writer_node_group *wng_new(unsigned num_writers)
 	g->written = para_calloc(num_writers * sizeof(size_t));
 	g->task.private_data = g;
 	g->task.post_select = wng_post_select;
-	g->task.error_handler = wng_error_handler;
-	g->task.flags = POST_ADD_TAIL | POST_EOF_IS_ERROR;
+	g->task.event_handler = wng_event_handler;
+	g->task.flags = POST_ADD_TAIL;
 	return g;
 }
 
@@ -158,6 +159,8 @@ struct writer_node_group *setup_default_wng(void)
 	else
 		default_writer = 1;
 	wng->writer_nodes[0].writer = &writers[default_writer];
+	sprintf(wng->writer_nodes[0].task.status, "%s",
+		writer_names[default_writer]);
 	PARA_INFO_LOG("using default writer: %s\n",
 		writer_names[default_writer]);
 	return wng;