X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=9e346df20f5f4d03e6d1dfaa4322a3eace524db1;hp=9b0bddc13e36d8fa9636c292b4c243e2e0416f86;hb=1583369f6defebc7f44249b9ce4cc01f717db3b9;hpb=8f79f577f809506a12799cb97dba1f111c014df5 diff --git a/sched.c b/sched.c index 9b0bddc1..9e346df2 100644 --- a/sched.c +++ b/sched.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * 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; @@ -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);