/*
- * 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.
*/
* 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;
- PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t);
+ PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
+ t->error <0? para_strerror(-t->error) : "shutdown");
if (t->pre_select)
list_del(&t->pre_select_node);
if (t->post_select)
list_del(&t->post_select_node);
- if (t->error >= 0)
- t->error = -E_TASK_KILLED;
-};
+ t->error = -E_TASK_UNREGISTERED;
+}
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)
if (!initialized)
return -E_NOT_INITIALIZED;
+ if (!s->select_function)
+ s->select_function = para_select;
gettimeofday(now, NULL);
again:
FD_ZERO(&s->rfds);
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);
INIT_LIST_HEAD(&pre_select_list);
INIT_LIST_HEAD(&post_select_list);
initialized = 1;
-};
+}
/**
* Add a task to the scheduler.
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);
}
}
list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node)
unregister_task(t);
initialized = 0;
-};
+}
/**
* Get the list of all registered tasks.