Add some more FEC source code documentation.

[paraslash.git] / sched.c

diff --git a/sched.c b/sched.c
index 5d4901df265e4b256bb4558382e7d4a5cb6b905f..9e346df20f5f4d03e6d1dfaa4322a3eace524db1 100644 (file)
--- 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,17 +32,17 @@ 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;
-       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;
 };
 
 
@@ -50,7 +50,8 @@ static void sched_preselect(struct sched *s)
 {
        struct task *t, *tmp;
        list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
-               t->pre_select(s, t);
+               if (t->error >= 0)
+                       t->pre_select(s, t);
 //             PARA_INFO_LOG("%s \n", t->status);
                if (t->error >= 0)
                        continue;
@@ -71,7 +72,8 @@ static void sched_post_select(struct sched *s)
        struct task *t, *tmp;
 
        list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
-               t->post_select(s, t);
+               if (t->error >= 0)
+                       t->post_select(s, t);
 //             PARA_INFO_LOG("%s: %d\n", t->status, t->ret);
                if (t->error >= 0)
                        continue;
@@ -103,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);
@@ -112,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);
@@ -172,7 +176,6 @@ void sched_shutdown(void)
                return;
        list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node)
                unregister_task(t);
-       /* remove tasks which do not have a pre_select hook */
        list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node)
                unregister_task(t);
        initialized = 0;
@@ -235,7 +238,6 @@ int kill_task(char *id)
                if (strcmp(id, buf))
                        continue;
                t->error = -E_TASK_KILLED;
-               unregister_task(t);
                return 1;
        }
        list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
@@ -243,7 +245,6 @@ int kill_task(char *id)
                if (strcmp(id, buf))
                        continue;
                t->error = -E_TASK_KILLED;
-               unregister_task(t);
                return 1;
        }
        return -E_NO_SUCH_TASK;