From dac49cd98bd243560138eb191fd8d7b05ed0aa7c Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 3 Oct 2016 21:04:27 +0200 Subject: Fix scheduler busy-waiting bug * fibers/internal.scm (schedule-runnables-for-next-turn): Fix bug where we were busy-waiting when there were no active fd's. --- fibers/internal.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'fibers') diff --git a/fibers/internal.scm b/fibers/internal.scm index ce83d58..81a0c60 100644 --- a/fibers/internal.scm +++ b/fibers/internal.scm @@ -301,15 +301,17 @@ ;; ;; FIXME: use a deque instead (set-scheduler-runnables! sched (reverse (scheduler-runnables sched))) - (unless (zero? (scheduler-active-fd-count sched)) - (atomic-box-set! (scheduler-inbox-state sched) 'needs-wake) - (epoll (scheduler-epfd sched) - 32 ; maxevents - (scheduler-poll-timeout sched) - #:folder (lambda (fd revents seed) - (schedule-fibers-for-fd fd revents sched) - seed)) - (atomic-box-set! (scheduler-inbox-state sched) 'will-check)) + (let ((timeout (scheduler-poll-timeout sched))) + (unless (and (not (zero? timeout)) + (zero? (scheduler-active-fd-count sched))) + (atomic-box-set! (scheduler-inbox-state sched) 'needs-wake) + (epoll (scheduler-epfd sched) + 32 ; maxevents + timeout + #:folder (lambda (fd revents seed) + (schedule-fibers-for-fd fd revents sched) + seed)) + (atomic-box-set! (scheduler-inbox-state sched) 'will-check))) (handle-inbox sched) (run-timers sched)) -- cgit v1.3