sched: Reset the descriptor sets on timeouts.
authorAndre Noll <maan@systemlinux.org>
Fri, 15 Jan 2010 19:21:13 +0000 (20:21 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 15 Jan 2010 19:21:13 +0000 (20:21 +0100)
This is certainly not neccessary on linux, but it does not hurt
and is clearly more portable.

sched.c

diff --git a/sched.c b/sched.c
index e58483e..5c18571 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -120,6 +120,16 @@ again:
        ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
        if (ret < 0)
                return ret;
        ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
        if (ret < 0)
                return ret;
+       if (ret == 0) {
+               /*
+                * APUE: Be careful not to check the descriptor sets on return
+                * unless the return value is greater than zero. The return
+                * state of the descriptor sets is implementation dependent if
+                * either a signal is caught or the timer expires.
+                */
+               FD_ZERO(&s->rfds);
+               FD_ZERO(&s->wfds);
+       }
        gettimeofday(now, NULL);
        sched_post_select(s);
        if (list_empty(&pre_select_list) && list_empty(&post_select_list))
        gettimeofday(now, NULL);
        sched_post_select(s);
        if (list_empty(&pre_select_list) && list_empty(&post_select_list))