X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=c5b2c5ea1b4badf8b5f2e02fe94a03c9cdb6421f;hp=bd98a51593593f4f345de376eee137bb7ac8a44b;hb=7d1805d1559e08e0af701155574aef220925d411;hpb=392fc2f4c17fcbfa9e5ba7a2a1c0e79446137169 diff --git a/sched.c b/sched.c index bd98a515..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; }