X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=50e87b54e46d71162103776a7e499dd9435cfb1d;hp=2501b50c276ad9ec717123f945d4faa9bdd13680;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=c77e19b4568a32923c0fe43503a4266363056a41

diff --git a/sched.c b/sched.c
index 2501b50c..50e87b54 100644
--- a/sched.c
+++ b/sched.c
@@ -36,7 +36,7 @@ static void unregister_task(struct task *t)
 		para_strerror(-t->error));
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
-	if (t->new_post_select || t->post_select)
+	if (t->new_post_select)
 		list_del(&t->post_select_node);
 }
 
@@ -62,20 +62,13 @@ static void sched_preselect(struct sched *s)
 static inline void call_post_select(struct sched *s, struct task *t)
 {
 #ifndef SCHED_DEBUG
-	if (t->new_post_select) {
-		t->error = t->new_post_select(s, t);
-		return;
-	}
-	return t->post_select(s, t);
+	t->error = t->new_post_select(s, t);
 #else
 	struct timeval t1, t2, diff;
 	unsigned long pst;
 
 	clock_get_realtime(&t1);
-	if (t->new_post_select)
-		t->error = t->new_post_select(s, t);
-	else
-		t->post_select(s, t);
+	t->error = t->new_post_select(s, t);
 	clock_get_realtime(&t2);
 	tv_diff(&t1, &t2, &diff);
 	pst = tv2ms(&diff);
@@ -175,9 +168,6 @@ void register_task(struct sched *s, struct task *t)
 	if (t->new_post_select) {
 		PARA_DEBUG_LOG("post_select: %p\n", &t->new_post_select);
 		list_add_tail(&t->post_select_node, &s->post_select_list);
-	} else if ((t->post_select)) {
-		PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
-		list_add_tail(&t->post_select_node, &s->post_select_list);
 	}
 }