]> git.tue.mpg.de Git - paraslash.git/commitdiff
Introduce sched->select_function.
authorAndre Noll <maan@systemlinux.org>
Sat, 12 Apr 2008 14:25:13 +0000 (16:25 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 12 Apr 2008 14:25:13 +0000 (16:25 +0200)
para_server needs this for locking.

sched.c
sched.h

diff --git a/sched.c b/sched.c
index 02793124f38b2c8a185dbe6fa7e1b27fd5306ab2..4df32fa1b16aa388eb46683bdd307c2a127c070c 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -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);
diff --git a/sched.h b/sched.h
index b92aaff75bd8554069145e70a1fe0db3274c4905..4d57c75f3e3bf9b3076e60012bd80fba7cb4567c 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -27,6 +27,8 @@ struct sched {
        fd_set wfds;
        /** Highest numbered file descriptor in any of the above fd sets. */
        int max_fileno;
+       /** In non-NULL, use this function instead of para_select. */
+       int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
 };
 
 /**