summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-10-03 21:04:27 +0200
committerAndy Wingo <wingo@pobox.com>2016-10-03 21:04:27 +0200
commitdac49cd98bd243560138eb191fd8d7b05ed0aa7c (patch)
tree8b37b6ff9f0d1c7a48fc689b36cec74292525830
parentTimeout CML operations (diff)
downloadguile-fibers-dac49cd98bd243560138eb191fd8d7b05ed0aa7c.tar.gz
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.
-rw-r--r--fibers/internal.scm20
1 files changed, 11 insertions, 9 deletions
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))