summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-09-20 02:13:07 +0200
committerAndy Wingo <wingo@pobox.com>2016-09-20 02:13:07 +0200
commit5a2106c65b9b3dacf6d92a434036a76ebafe1efb (patch)
treed84ca9b478eb9a643600ab3ab4997bde4d5a3c7c
parentUpdate TODO.md (diff)
downloadguile-fibers-5a2106c65b9b3dacf6d92a434036a76ebafe1efb.tar.gz
Add support for ,spawn-fiber
-rw-r--r--fibers.scm21
-rw-r--r--fibers/internal.scm53
-rw-r--r--fibers/repl.scm109
3 files changed, 149 insertions, 34 deletions
diff --git a/fibers.scm b/fibers.scm
index 0af520a..8548ddb 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -53,16 +53,17 @@
(install-suspendable-ports? #t)
(keep-scheduler? (eq? scheduler (current-scheduler))))
(when install-suspendable-ports? (install-suspendable-ports!))
- (parameterize ((current-scheduler scheduler)
- (current-read-waiter wait-for-readable)
- (current-write-waiter wait-for-writable))
- (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)))))
+ (with-scheduler
+ scheduler
+ (parameterize ((current-read-waiter wait-for-readable)
+ (current-write-waiter wait-for-writable))
+ (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 d65ed1d..929bf06 100644
--- a/fibers/internal.scm
+++ b/fibers/internal.scm
@@ -31,7 +31,10 @@
#:use-module (ice-9 suspendable-ports)
#:export (;; Low-level interface: schedulers and threads.
make-scheduler
- current-scheduler
+ with-scheduler
+ scheduler-name
+ (current-scheduler/public . current-scheduler)
+ (scheduler-kernel-thread/public . scheduler-kernel-thread)
run-scheduler
destroy-scheduler
add-fd-events!
@@ -65,9 +68,11 @@
(nameset-ref fibers-nameset name))
(define-record-type <scheduler>
- (%make-scheduler epfd active-fd-count prompt-tag runnables
- sources sleepers inbox inbox-state wake-pipe)
- nio?
+ (%make-scheduler name epfd active-fd-count prompt-tag runnables
+ sources sleepers inbox inbox-state wake-pipe
+ kernel-thread)
+ scheduler?
+ (name scheduler-name set-scheduler-name!)
(epfd scheduler-epfd)
(active-fd-count scheduler-active-fd-count set-scheduler-active-fd-count!)
(prompt-tag scheduler-prompt-tag)
@@ -82,7 +87,9 @@
;; atomic box of either 'will-check, 'needs-wake or 'dead
(inbox-state scheduler-inbox-state)
;; (read-pipe . write-pipe)
- (wake-pipe scheduler-wake-pipe))
+ (wake-pipe scheduler-wake-pipe)
+ ;; atomic parameter of thread
+ (kernel-thread scheduler-kernel-thread))
;; fixme: prevent fibers from running multiple times in a turn
(define-record-type <fiber>
@@ -108,6 +115,17 @@
(set-nonblocking! write-pipe)
pair))))
+(define (make-atomic-parameter init)
+ (let ((box (make-atomic-box init)))
+ (case-lambda
+ (() (atomic-box-ref box))
+ ((new)
+ (if (eq? new init)
+ (atomic-box-set! box new)
+ (let ((prev (atomic-box-compare-and-swap! box init new)))
+ (unless (eq? prev init)
+ (error "owned by other thread" prev))))))))
+
;; FIXME: Perhaps epoll should handle the wake pipe business itself
(define (make-scheduler)
(let ((epfd (epoll-create))
@@ -120,17 +138,32 @@
<))
(inbox (make-atomic-box '()))
(inbox-state (make-atomic-box 'will-check))
- (wake-pipe (make-wake-pipe)))
+ (wake-pipe (make-wake-pipe))
+ (kernel-thread (make-atomic-parameter #f)))
(match wake-pipe
((read-pipe . _)
(epoll-add! epfd (fileno read-pipe) EPOLLIN)))
- (let ((sched (%make-scheduler epfd active-fd-count prompt-tag
+ (let ((sched (%make-scheduler #f epfd active-fd-count prompt-tag
runnables sources sleepers
- inbox inbox-state wake-pipe)))
- (nameset-add! schedulers-nameset sched)
+ inbox inbox-state wake-pipe kernel-thread)))
+ (set-scheduler-name! sched (nameset-add! schedulers-nameset sched))
sched)))
+(define-syntax-rule (with-scheduler scheduler body ...)
+ (let ((sched scheduler))
+ (dynamic-wind (lambda ()
+ ((scheduler-kernel-thread sched) (current-thread)))
+ (lambda ()
+ (parameterize ((current-scheduler sched))
+ body ...))
+ (lambda ()
+ ((scheduler-kernel-thread sched) #f)))))
+
+(define (scheduler-kernel-thread/public sched)
+ ((scheduler-kernel-thread sched)))
+
(define current-scheduler (make-parameter #f))
+(define (current-scheduler/public) (current-scheduler))
(define (make-source events expiry fiber) (vector events expiry fiber))
(define (source-events s) (vector-ref s 0))
(define (source-expiry s) (vector-ref s 1))
@@ -359,7 +392,7 @@
(define* (resume-fiber fiber thunk)
(let* ((cont (fiber-data fiber))
- (thunk (lambda () (cont thunk))))
+ (thunk (if cont (lambda () (cont thunk)) thunk)))
(schedule-fiber! fiber thunk)))
(define (finalize-fd sched fd)
diff --git a/fibers/repl.scm b/fibers/repl.scm
index 1a5365d..b751b61 100644
--- a/fibers/repl.scm
+++ b/fibers/repl.scm
@@ -18,27 +18,108 @@
;;;;
(define-module (fibers repl)
+ #:use-module (system repl common)
#:use-module (system repl command)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
+ #:use-module (fibers)
#:use-module (fibers internal))
-(define-meta-command ((fibers fibers) repl #:optional sched)
- "fibers [SCHED]
-Show a list of fibers.
+(define (sleep-forever)
+ (let lp () (sleep 3600) (lp)))
-If SCHED is given, limit to fibers bound to the given fold."
- (match (sort (fold-all-fibers acons '())
+(define repl-current-scheds (make-doubly-weak-hash-table))
+(define (repl-current-sched repl)
+ (hashq-ref repl-current-scheds repl))
+(define (repl-set-current-sched! repl sched verbose?)
+ (when verbose?
+ (format #t "Scheduler ~a on thread ~a is now current\n."
+ (scheduler-name sched) (scheduler-kernel-thread sched)))
+ (hashq-set! repl-current-scheds repl sched))
+(define* (repl-ensure-current-sched repl #:optional (verbose? #t))
+ (define (sched-alive? sched)
+ ;; FIXME: ensure scheduler has not been destroyed.
+ (and (scheduler-kernel-thread sched)))
+ (or (repl-current-sched repl)
+ (let lp ((scheds (fold-all-schedulers acons '())))
+ (match scheds
+ (()
+ (let* ((sched (make-scheduler))
+ (thread (call-with-new-thread
+ (lambda ()
+ (run-fibers sleep-forever
+ #:scheduler sched)))))
+ (when verbose?
+ (format #t "No active schedulers; spawned a new one.\n"))
+ (repl-set-current-sched! repl sched verbose?)
+ sched))
+ (((id . (and sched (? sched-alive?))) . scheds)
+ (when verbose?
+ (format #t "No current scheduler; choosing one randomly.\n"))
+ (repl-set-current-sched! repl sched verbose?)
+ sched)))))
+
+(define-meta-command ((scheds fibers) repl)
+ "scheds
+Show a list of schedulers."
+ (match (sort (fold-all-schedulers acons '())
(match-lambda*
(((id1 . _) (id2 . _)) (< id1 id2))))
- (() (format #t "No fibers.\n"))
- (fibers
- (format #t "~a ~8t~a\n" "fiber" "state")
- (format #t "~a ~8t~a\n" "-----" "-----")
+ (() (format #t "No schedulers.\n"))
+ (schedulers
+ (format #t "~a ~8t~a\n" "sched" "kernel thread")
+ (format #t "~a ~8t~a\n" "-----" "-------------")
(for-each
(match-lambda
- ((id . fiber)
- ;; How to show fiber data? Would be nice to say "suspended
- ;; at foo.scm:32:4".
- (format #t "~a ~8t~a\n" id (fiber-state fiber))))
- fibers))))
+ ((id . sched)
+ (format #t "~a ~8t~a\n" id (scheduler-kernel-thread sched))))
+ schedulers))))
+
+(define-meta-command ((spawn-sched fibers) repl)
+ "spawn-sched
+Create a new scheduler for fibers, and run it on a new kernel thread."
+ (call-with-new-thread (lambda ()
+ (run-fibers sleep-forever))))
+
+(define-meta-command ((kill-sched fibers) repl sched)
+ "kill-sched SCHED
+Shut down a scheduler."
+ (display "Don't know how to do that yet!\n"))
+
+(define-meta-command ((fibers fibers) repl #:optional sched)
+ "fibers [SCHED]
+Show a list of fibers.
+
+If SCHED is given, limit to fibers bound to the given fold."
+ (let ((sched (and sched
+ (or (scheduler-by-name sched)
+ (error "no scheduler with name" sched)))))
+ (match (sort (fold-all-fibers acons '())
+ (match-lambda*
+ (((id1 . _) (id2 . _)) (< id1 id2))))
+ (() (format #t "No fibers.\n"))
+ (fibers
+ (format #t "~a ~8t~a\n" "fiber" "state")
+ (format #t "~a ~8t~a\n" "-----" "-----")
+ (for-each
+ (match-lambda
+ ((id . fiber)
+ ;; How to show fiber data? Would be nice to say "suspended
+ ;; at foo.scm:32:4".
+ (when (or (not sched) (eq? (fiber-scheduler fiber) sched))
+ (format #t "~a ~8t~a\n" id (fiber-state fiber)))))
+ fibers)))))
+
+(define-meta-command ((spawn-fiber fibers) repl (form) #:optional sched)
+ "spawn-fiber EXP [SCHED]
+Spawn a new fiber that runs EXP.
+
+If SCHED is given, the fiber will be spawned on the given scheduler."
+ (let ((thunk (repl-prepare-eval-thunk repl (repl-parse repl form)))
+ (sched (repl-ensure-current-sched repl)))
+ (create-fiber sched thunk)))
+
+(define-meta-command ((kill-fiber fibers) repl fiber)
+ "kill-fiber FIBER
+Shut down a fiber."
+ (display "Don't know how to do that yet!\n"))