summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-09-10 21:03:07 +0200
committerAndy Wingo <wingo@pobox.com>2016-09-10 21:05:13 +0200
commit330df8bd407224a4e1c3d8dac9ced93c0507be5a (patch)
tree0c593ef722d39c052825dfa7171a1d426080941a
parentBetter fiber run order (diff)
downloadguile-fibers-330df8bd407224a4e1c3d8dac9ced93c0507be5a.tar.gz
run-fibers returns values from initial thread
* fibers.scm (run-fibers): * fibers/internal.scm (run-scheduler): If there is an init thunk, keep the scheduler running until the corresponding fiber is finished. Return the values returned from the fiber. * tests/basic.scm (assert-run-fibers-terminates): Return values. (assert-run-fibers-returns): New helper. Use it.
Diffstat (limited to '')
-rw-r--r--fibers.scm10
-rw-r--r--fibers/internal.scm9
-rw-r--r--tests/basic.scm16
3 files changed, 26 insertions, 9 deletions
diff --git a/fibers.scm b/fibers.scm
index 135fbd6..9813755 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -55,9 +55,13 @@
(parameterize ((current-scheduler scheduler)
(current-read-waiter wait-for-readable)
(current-write-waiter wait-for-writable))
- (when init (spawn-fiber init scheduler))
- (run-scheduler scheduler))
- (unless keep-scheduler? (destroy-scheduler scheduler)))
+ (call-with-values
+ (lambda ()
+ (run-scheduler scheduler
+ #:join-fiber (and init (spawn-fiber init scheduler))))
+ (lambda vals
+ (unless keep-scheduler? (destroy-scheduler scheduler))
+ (apply values vals)))))
(define (require-current-scheduler)
(or (current-scheduler)
diff --git a/fibers/internal.scm b/fibers/internal.scm
index 2fe7673..4012042 100644
--- a/fibers/internal.scm
+++ b/fibers/internal.scm
@@ -281,7 +281,7 @@
(only-finished-if (null? (atomic-box-ref (scheduler-inbox sched))))
(only-finished-if (psq-empty? (scheduler-sleepers sched)))))
-(define (run-scheduler sched)
+(define* (run-scheduler sched #:key join-fiber)
(let lp ()
(schedule-runnables-for-next-turn sched)
(match (scheduler-runnables sched)
@@ -289,8 +289,11 @@
;; Could be the scheduler is stopping, or it could be that we
;; got a spurious wakeup. In any case, this is the place to
;; check to see whether the scheduler is really done.
- (unless (scheduler-finished? sched)
- (lp)))
+ (cond
+ ((not (scheduler-finished? sched)) (lp))
+ ((not join-fiber) (values))
+ ((not (eq? (fiber-state join-fiber) 'finished)) (lp))
+ (else (apply values (fiber-data join-fiber)))))
(runnables
(set-scheduler-runnables! sched '())
(for-each run-fiber runnables)
diff --git a/tests/basic.scm b/tests/basic.scm
index 44ff032..dcae6fb 100644
--- a/tests/basic.scm
+++ b/tests/basic.scm
@@ -45,9 +45,17 @@
(format #t "assert run-fibers on ~s terminates: " 'exp)
(force-output)
(let ((start (get-internal-real-time)))
- (run-fibers (lambda () exp))
- (format #t "ok (~a s)\n" (/ (- (get-internal-real-time) start)
- 1.0 internal-time-units-per-second)))))
+ (call-with-values (lambda () (run-fibers (lambda () exp)))
+ (lambda vals
+ (format #t "ok (~a s)\n" (/ (- (get-internal-real-time) start)
+ 1.0 internal-time-units-per-second))
+ (apply values vals))))))
+
+(define-syntax-rule (assert-run-fibers-returns exp expected ...)
+ (begin
+ (call-with-values (lambda () (assert-run-fibers-terminates exp))
+ (lambda run-fiber-return-vals
+ (assert-equal '(expected ...) run-fiber-return-vals)))))
(define-syntax-rule (do-times n exp)
(let lp ((count n))
@@ -116,6 +124,8 @@
(iota count)))
(assert-run-fibers-terminates (test-wakeup-order 10)))
+(assert-run-fibers-returns 1 1)
+
;; sleep wakeup order
;; fib using channels