X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=sched.c;h=9db7c092e0209ac542283980773a9519a4f3b49a;hb=081e022105bbfd6c1e56730200919f276b1ff630;hp=fad70132232268a2c9aade01c12b29e68f8987dc;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3;p=paraslash.git

diff --git a/sched.c b/sched.c
index fad70132..9db7c092 100644
--- a/sched.c
+++ b/sched.c
@@ -16,16 +16,9 @@ static void sched_preselect(struct sched *s)
 again:
 	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
 		t->pre_select(s, t);
-		if (t->ret > 0 || !t->error_handler)
+		if (t->ret > 0 || !t->event_handler)
 			continue;
-		if (t->ret < 0) {
-			t->error_handler(t);
-			goto again;
-		}
-		if (!(t->flags & PRE_EOF_IS_ERROR))
-			continue;
-		t->ret = -E_PRE_EOF;
-		t->error_handler(t);
+		t->event_handler(t);
 		goto again;
 	}
 }
@@ -36,16 +29,9 @@ static void sched_post_select(struct sched *s)
 
 	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
 		t->post_select(s, t);
-		if (t->ret > 0 || !t->error_handler)
-			continue;
-		if (t->ret < 0) {
-			t->error_handler(t);
-			continue;
-		}
-		if (!(t->flags & POST_EOF_IS_ERROR))
+		if (t->ret > 0 || !t->event_handler)
 			continue;
-		t->ret = -E_POST_EOF;
-		t->error_handler(t);
+		t->event_handler(t);
 	}
 }
 
@@ -72,7 +58,7 @@ again:
 
 void *register_task(struct task *t)
 {
-	PARA_INFO_LOG("registering task %p\n", t);
+	PARA_INFO_LOG("registering %s (%p)\n", t->status, t);
 	if (t->pre_select) {
 		PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select);
 		if (t->flags & PRE_ADD_TAIL)
@@ -92,7 +78,7 @@ void *register_task(struct task *t)
 
 void unregister_task(struct task *t)
 {
-	PARA_INFO_LOG("unregistering task %p\n", t);
+	PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t);
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
 	if (t->post_select)