summaryrefslogtreecommitdiff
path: root/fibers
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2017-02-19 21:18:21 +0100
committerAndy Wingo <wingo@pobox.com>2017-02-19 21:18:21 +0100
commita9354b5a47c978d9bbc7095ea872e50e72f8800d (patch)
tree7c4529b65b5ca076d97e9e665fc434cf7ca55410 /fibers
parentFix make -j problem (diff)
downloadguile-fibers-a9354b5a47c978d9bbc7095ea872e50e72f8800d.tar.gz
run-fibers returns when initial fiber finishes
* epoll.c (scm_primitive_epoll_wait): Accept timeout in internal time units instead of milliseconds. Avoid some overhead if the timeout is zero. * fibers/epoll.scm (epoll): Adapt to primitive-epoll-wait chance. Change get-timeout callback to an "expiry" argument and an update-expiry last-minute function. Tighten the window around the "waiting" epoll-state. * fibers.scm (%run-fibers): Remove current-read-waiter / current-write-waiter parameterization, given that fibers individually each have this parameterization. (run-fibers): Add #:drain? argument. * fibers/internal.scm (schedule-runnables-for-next-turn): Simplify a bit, inlining scheduler-poll-timeout and adapting to epoll change. (scheduler-work-pending?): New function. (run-scheduler): Simplify finish? logic. * tests/basic.scm: * tests/speedup.scm: Update to drain where needed. * fibers.texi: Update for new run-fibers termination condition.
Diffstat (limited to 'fibers')
-rw-r--r--fibers/epoll.scm43
-rw-r--r--fibers/internal.scm93
2 files changed, 71 insertions, 65 deletions
diff --git a/fibers/epoll.scm b/fibers/epoll.scm
index d4674a7..55d88a3 100644
--- a/fibers/epoll.scm
+++ b/fibers/epoll.scm
@@ -150,24 +150,35 @@ epoll wait (if appropriate)."
(set-epoll-eventsv! epoll v)
v))))
-(define* (epoll epoll #:key (get-timeout (lambda () -1))
+(define* (epoll epoll #:key (expiry #f)
+ (update-expiry (lambda (expiry) expiry))
(folder epoll-default-folder) (seed '()))
- (atomic-box-set! (epoll-state epoll) 'waiting)
+ (define (expiry->timeout expiry)
+ (cond
+ ((not expiry) -1)
+ (else
+ (let ((now (get-internal-real-time)))
+ (cond
+ ((< expiry now) 0)
+ (else (- expiry now)))))))
(let* ((maxevents (epoll-maxevents epoll))
(eventsv (ensure-epoll-eventsv epoll maxevents))
(write-pipe-fd (fileno (epoll-wake-write-pipe epoll)))
(read-pipe-fd (fileno (epoll-wake-read-pipe epoll)))
- (n (primitive-epoll-wait (epoll-fd epoll) write-pipe-fd read-pipe-fd
- eventsv (get-timeout))))
- ;; If we received `maxevents' events, it means that probably there
- ;; are more active fd's in the queue that we were unable to
- ;; receive. Expand our event buffer in that case.
- (when (= n maxevents)
- (set-epoll-maxevents! epoll (* maxevents 2)))
- (atomic-box-set! (epoll-state epoll) 'not-waiting)
- (let lp ((seed seed) (i 0))
- (if (< i n)
- (let ((fd (bytevector-s32-native-ref eventsv (fd-offset i)))
- (events (bytevector-u32-native-ref eventsv (events-offset i))))
- (lp (folder fd events seed) (1+ i)))
- seed))))
+ (timeout (expiry->timeout (update-expiry expiry))))
+ (atomic-box-set! (epoll-state epoll) 'waiting)
+ (let ((n (primitive-epoll-wait (epoll-fd epoll)
+ write-pipe-fd read-pipe-fd
+ eventsv timeout)))
+ (atomic-box-set! (epoll-state epoll) 'not-waiting)
+ ;; If we received `maxevents' events, it means that probably there
+ ;; are more active fd's in the queue that we were unable to
+ ;; receive. Expand our event buffer in that case.
+ (when (= n maxevents)
+ (set-epoll-maxevents! epoll (* maxevents 2)))
+ (let lp ((seed seed) (i 0))
+ (if (< i n)
+ (let ((fd (bytevector-s32-native-ref eventsv (fd-offset i)))
+ (events (bytevector-u32-native-ref eventsv (events-offset i))))
+ (lp (folder fd events seed) (1+ i)))
+ seed)))))
diff --git a/fibers/internal.scm b/fibers/internal.scm
index 31b17b8..79b1011 100644
--- a/fibers/internal.scm
+++ b/fibers/internal.scm
@@ -35,6 +35,7 @@
scheduler-runcount
(scheduler-kernel-thread/public . scheduler-kernel-thread)
scheduler-remote-peers
+ scheduler-work-pending?
choose-parallel-scheduler
run-scheduler
destroy-scheduler
@@ -243,27 +244,6 @@ thread."
(resume revents))
(lp waiters)))))))
-(define (scheduler-finished? sched finished?)
- (and (finished?)
- (psq-empty? (scheduler-timers sched))))
-
-(define (scheduler-poll-timeout sched finished?)
- (cond
- ((not (stack-empty? (scheduler-next-runqueue sched)))
- ;; Don't sleep if there are fibers in the runqueue already.
- 0)
- ((psq-empty? (scheduler-timers sched))
- ;; Avoid sleeping if the scheduler is actually finished.
- (if (finished?) 0 -1))
- (else
- (match (psq-min (scheduler-timers sched))
- ((expiry . thunk)
- (let ((now (get-internal-real-time)))
- (if (< expiry now)
- 0
- (round/ (- expiry now)
- internal-time-units-per-millisecond))))))))
-
(define (run-timers sched)
;; Run expired timer thunks in the order that they expired.
(let ((now (get-internal-real-time)))
@@ -279,7 +259,7 @@ thread."
(thunk)
(run-timers timers)))))))))
-(define (schedule-runnables-for-next-turn sched finished?)
+(define (schedule-runnables-for-next-turn sched)
;; Called when all runnables from the current turn have been run.
;; Note that there may be runnables already scheduled for the next
;; turn; one way this can happen is if a fiber suspended itself
@@ -288,11 +268,24 @@ thread."
;; In any case, check the kernel to see if any of the fd's that we
;; are interested in are active, and in that case schedule their
;; corresponding fibers. Also run any timers that have timed out.
+ (define (timers-expiry timers)
+ (and (not (psq-empty? timers))
+ (match (psq-min timers)
+ ((expiry . thunk)
+ expiry))))
+ (define (update-expiry expiry)
+ ;; If there are pending runnables, cause epoll to return
+ ;; immediately.
+ (if (stack-empty? (scheduler-next-runqueue sched))
+ expiry
+ 0))
(epoll (scheduler-epfd sched)
- #:get-timeout (lambda () (scheduler-poll-timeout sched finished?))
- #:folder (lambda (fd revents seed)
+ #:expiry (timers-expiry (scheduler-timers sched))
+ #:update-expiry update-expiry
+ #:folder (lambda (fd revents sched)
(schedule-fibers-for-fd fd revents sched)
- seed))
+ sched)
+ #:seed sched)
(run-timers sched))
(define (fiber-stealer sched)
@@ -305,6 +298,13 @@ stolen."
(and peer
(stack-pop! (scheduler-current-runqueue peer) #f))))))
+(define (scheduler-work-pending? sched)
+ "Return @code{#t} if @var{sched} has any work pending: any runnable
+fibers or any pending timeouts."
+ (not (and (psq-empty? (scheduler-timers sched))
+ (stack-empty? (scheduler-current-runqueue sched))
+ (stack-empty? (scheduler-next-runqueue sched)))))
+
(define* (run-scheduler sched finished?)
"Run @var{sched} until there are no more fibers ready to run, no
file descriptors being waited on, and no more timers pending to run.
@@ -326,30 +326,25 @@ Return zero values."
(set-fiber-continuation! fiber k)
(after-suspend fiber))))
(let next-turn ()
- (schedule-runnables-for-next-turn sched finished?)
- (stack-push-list! cur (reverse (stack-pop-all! next)))
- (let next-fiber ()
- (match (stack-pop! cur #f)
- (#f
- (cond
- ((stack-empty? next)
- ;; Both current and next runqueues are empty; steal a
- ;; little bit of work from a remote scheduler if we
- ;; can. Run it directly instead of pushing onto a
- ;; queue to avoid double stealing.
- (match (steal-fiber!)
- (#f
- (unless (scheduler-finished? sched finished?)
- (next-turn)))
- (fiber
- (set-fiber-scheduler! fiber sched)
- (run-fiber fiber)
- (next-turn))))
- (else
- (next-turn))))
- (fiber
- (run-fiber fiber)
- (next-fiber)))))))
+ (unless (finished?)
+ (schedule-runnables-for-next-turn sched)
+ (stack-push-list! cur (reverse (stack-pop-all! next)))
+ (let next-fiber ()
+ (match (stack-pop! cur #f)
+ (#f
+ (when (stack-empty? next)
+ ;; Both current and next runqueues are empty; steal a
+ ;; little bit of work from a remote scheduler if we
+ ;; can. Run it directly instead of pushing onto a
+ ;; queue to avoid double stealing.
+ (let ((fiber (steal-fiber!)))
+ (when fiber
+ (set-fiber-scheduler! fiber sched)
+ (run-fiber fiber))))
+ (next-turn))
+ (fiber
+ (run-fiber fiber)
+ (next-fiber))))))))
(define (destroy-scheduler sched)
"Release any resources associated with @var{sched}."