Merge branch 'master' into next

[paraslash.git] / sched.c

diff --git a/sched.c b/sched.c
index b9d642864624cd796e3853331cc9a652378c41c5..44e66c9b62664eb3add50d9924db6b311ea7e273 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -1,11 +1,12 @@
 /*
- * 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.
  */
 
 /** \file sched.c Paraslash's scheduling functions. */
 
+#include <regex.h>
 #include <dirent.h> /* readdir() */
 #include <assert.h>
 #include <sys/time.h>
@@ -32,24 +33,25 @@ 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);
        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)
@@ -104,6 +106,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);
@@ -113,7 +117,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);
@@ -132,7 +136,7 @@ static void init_sched(void)
        INIT_LIST_HEAD(&pre_select_list);
        INIT_LIST_HEAD(&post_select_list);
        initialized = 1;
-};
+}
 
 /**
  * Add a task to the scheduler.
@@ -154,7 +158,7 @@ void register_task(struct task *t)
                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);
        }
 }
@@ -176,7 +180,7 @@ void sched_shutdown(void)
        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.