X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=sched.c;h=daf6603f7de5730bdbdc82c59b565c7c7d7338b8;hb=b1715277edebbe8db0223cdf1132da25252d282e;hp=9b0bddc13e36d8fa9636c292b4c243e2e0416f86;hpb=8f79f577f809506a12799cb97dba1f111c014df5;p=paraslash.git

diff --git a/sched.c b/sched.c
index 9b0bddc1..daf6603f 100644
--- a/sched.c
+++ b/sched.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -32,7 +32,7 @@ struct timeval *now = &now_struct;
  * If the pre_select pointer of \a t is not \p NULL, it is removed from
  * the pre_select list of the scheduler. Same goes for \a post_select.
  */
-void unregister_task(struct task *t)
+static void unregister_task(struct task *t)
 {
 	if (!initialized)
 		return;
@@ -50,7 +50,7 @@ static void sched_preselect(struct sched *s)
 {
 	struct task *t, *tmp;
 	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
-		if (t->error >= 0)
+		if (t->error >= 0 && t->pre_select)
 			t->pre_select(s, t);
 //		PARA_INFO_LOG("%s \n", t->status);
 		if (t->error >= 0)
@@ -105,6 +105,8 @@ int schedule(struct sched *s)
 
 	if (!initialized)
 		return -E_NOT_INITIALIZED;
+	if (!s->select_function)
+		s->select_function = para_select;
 	gettimeofday(now, NULL);
 again:
 	FD_ZERO(&s->rfds);
@@ -114,7 +116,7 @@ again:
 	sched_preselect(s);
 	if (list_empty(&pre_select_list) && list_empty(&post_select_list))
 		return 0;
-	ret = para_select(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
+	ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
 	if (ret < 0)
 		return ret;
 	gettimeofday(now, NULL);
@@ -155,7 +157,7 @@ void register_task(struct task *t)
 		list_add_tail(&t->pre_select_node, &pre_select_list);
 	}
 	if (t->post_select) {
-		PARA_DEBUG_LOG("post_select: %p\n", &t->pre_select);
+		PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
 		list_add_tail(&t->post_select_node, &post_select_list);
 	}
 }