diff options
| author | Andy Wingo <wingo@pobox.com> | 2016-09-10 21:03:07 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-09-10 21:05:13 +0200 |
| commit | 330df8bd407224a4e1c3d8dac9ced93c0507be5a (patch) | |
| tree | 0c593ef722d39c052825dfa7171a1d426080941a /fibers | |
| parent | Better fiber run order (diff) | |
| download | guile-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 'fibers')
| -rw-r--r-- | fibers/internal.scm | 9 |
1 files changed, 6 insertions, 3 deletions
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) |
