X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sched.c;h=c5b2c5ea1b4badf8b5f2e02fe94a03c9cdb6421f;hb=d7f72444e863fb5aae145d4e720cd71dc03578b0;hp=879ab80820e56742815044d158f25aec965359db;hpb=d46fe38dcada4108ed49a0e621376df0f7913fe3;p=paraslash.git

diff --git a/sched.c b/sched.c
index 879ab808..c5b2c5ea 100644
--- a/sched.c
+++ b/sched.c
@@ -10,6 +10,9 @@
 struct list_head pre_select_list;
 struct list_head post_select_list;
 
+static struct timeval now_struct;
+struct timeval *now = &now_struct;
+
 static void sched_preselect(struct sched *s)
 {
 	struct task *t, *tmp;
@@ -42,7 +45,7 @@ static void sched_post_select(struct sched *s)
 int sched(struct sched *s)
 {
 
-	gettimeofday(&s->now, NULL);
+	gettimeofday(now, NULL);
 again:
 	FD_ZERO(&s->rfds);
 	FD_ZERO(&s->wfds);
@@ -53,7 +56,7 @@ again:
 		&s->wfds, &s->timeout);
 	if (s->select_ret < 0)
 		return s->select_ret;
-	gettimeofday(&s->now, NULL);
+	gettimeofday(now, NULL);
 	sched_post_select(s);
 	if (list_empty(&pre_select_list) && list_empty(&post_select_list))
 		return 0;
@@ -65,17 +68,11 @@ void *register_task(struct task *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)
-			list_add_tail(&t->pre_select_node, &pre_select_list);
-		else
-			list_add(&t->pre_select_node, &pre_select_list);
+		list_add(&t->pre_select_node, &pre_select_list);
 	}
 	if (t->post_select) {
 		PARA_DEBUG_LOG("post_select: %p\n", &t->pre_select);
-		if (t->flags & POST_ADD_TAIL)
-			list_add_tail(&t->post_select_node, &post_select_list);
-		else
-			list_add(&t->post_select_node, &post_select_list);
+		list_add(&t->post_select_node, &post_select_list);
 	}
 	return t;
 }
@@ -112,15 +109,15 @@ char *get_task_list(void)
 	char *msg = NULL;
 	list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
 		char *tmp_msg;
-		tmp_msg = make_message("%s%p\t%s\n", msg? msg : "", t, t->status);
+		tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status);
 		free(msg);
 		msg = tmp_msg;
 	}
 	list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
 		char *tmp_msg;
-		if (t->pre_select)
-			continue;
-		tmp_msg = make_message("%s%p\t%s\n", msg? msg : "", t, t->status);
+//		if (t->pre_select)
+//			continue;
+		tmp_msg = make_message("%s%p\tpost\t%s\n", msg? msg : "", t, t->status);
 		free(msg);
 		msg = tmp_msg;
 	}