X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sched.c;h=b6efb1ae815309e672997abca57ae97a8f6906d1;hp=e58483e9385e5092c094ac0f2b30b06c905e6627;hb=d96c06ff93493c125b9f4d36655e77d7029ca309;hpb=fc100a582159c001bd5eb2244f314343309bb503

diff --git a/sched.c b/sched.c
index e58483e9..b6efb1ae 100644
--- 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;
+	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))
@@ -279,4 +289,11 @@ void sched_request_barrier(struct timeval *barrier, struct sched *s)
 	sched_request_timeout(&diff, s);
 }
 
+void sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s)
+{
+	struct timeval diff;
 
+	if (tv_diff(now, barrier, &diff) > 0)
+		return sched_min_delay(s);
+	sched_request_timeout(&diff, s);
+}