summaryrefslogtreecommitdiff
path: root/fibers.scm
diff options
context:
space:
mode:
Diffstat (limited to 'fibers.scm')
-rw-r--r--fibers.scm26
1 files changed, 15 insertions, 11 deletions
diff --git a/fibers.scm b/fibers.scm
index 21a56a6..5c4c291 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -21,6 +21,7 @@
#:use-module (fibers internal)
#:use-module (fibers repl)
#:use-module (fibers timers)
+ #:use-module (fibers interrupts)
#:use-module ((ice-9 ports internal)
#:select (port-read-wait-fd port-write-wait-fd))
#:use-module (ice-9 suspendable-ports)
@@ -39,7 +40,7 @@
(resume-on-writable-fd (port-read-wait-fd port) fiber))))
(define* (run-fibers #:optional (init #f)
- #:key (hz 0) (scheduler (make-scheduler #:hz hz))
+ #:key (hz 0) (scheduler (make-scheduler))
(install-suspendable-ports? #t)
(keep-scheduler? (eq? scheduler (current-scheduler))))
(when install-suspendable-ports? (install-suspendable-ports!))
@@ -47,16 +48,19 @@
scheduler
(parameterize ((current-read-waiter wait-for-readable)
(current-write-waiter wait-for-writable))
- (let ((ret #f))
- (spawn-fiber (lambda ()
- (call-with-values (or init values)
- (lambda vals (set! ret vals))))
- scheduler)
- (let lp ()
- (run-scheduler scheduler)
- (unless ret (lp)))
- (unless keep-scheduler? (destroy-scheduler scheduler))
- (apply values ret)))))
+ (with-interrupts
+ hz yield-current-fiber
+ (lambda ()
+ (let ((ret #f))
+ (spawn-fiber (lambda ()
+ (call-with-values (or init values)
+ (lambda vals (set! ret vals))))
+ scheduler)
+ (let lp ()
+ (run-scheduler scheduler)
+ (unless ret (lp)))
+ (unless keep-scheduler? (destroy-scheduler scheduler))
+ (apply values ret)))))))
(define (require-current-scheduler)
(or (current-scheduler)