summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-09-07 11:33:48 +0200
committerAndy Wingo <wingo@pobox.com>2016-09-07 11:33:48 +0200
commit7d969aeabe46201af639c80eb54c5e4bd97ee13a (patch)
tree17646c341b23b5230ebe4a990b5b621dd80e0d59
parentAdd channels implementation (diff)
downloadguile-fibers-7d969aeabe46201af639c80eb54c5e4bd97ee13a.tar.gz
Separate public and private fibers interfaces
* fibers/internal.scm: New file, factored out of (fibers). * fibers.scm: Refactor to be just the public interface. * fibers/channels.scm: * web/server/fibers.scm: * examples/memcached-client.scm: * examples/memcached-server.scm: * examples/ping-client.scm: * examples/ping-server.scm: Adapt to interface changes. * Makefile.am (SOURCES): Add (fibers internal).
-rw-r--r--Makefile.am5
-rw-r--r--examples/memcached-client.scm13
-rw-r--r--examples/memcached-server.scm14
-rw-r--r--examples/ping-client.scm18
-rw-r--r--examples/ping-server.scm9
-rw-r--r--fibers.scm288
-rw-r--r--fibers/channels.scm17
-rw-r--r--fibers/internal.scm256
-rw-r--r--web/server/fibers.scm25
9 files changed, 343 insertions, 302 deletions
diff --git a/Makefile.am b/Makefile.am
index 1dda366..6e478b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,10 @@ godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache
info_TEXINFOS=fibers.texi
SOURCES = \
- fibers/epoll.scm \
- fibers/channels.scm \
fibers.scm \
+ fibers/channels.scm \
+ fibers/epoll.scm \
+ fibers/internal.scm \
web/server/fibers.scm
extlibdir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions
diff --git a/examples/memcached-client.scm b/examples/memcached-client.scm
index 9adc58c..3b6e1ec 100644
--- a/examples/memcached-client.scm
+++ b/examples/memcached-client.scm
@@ -29,10 +29,8 @@
(setvbuf port 'block 1024))
(define (server-error port msg . args)
- (apply format (current-error-port) msg args)
- (newline (current-error-port))
(close-port port)
- (suspend))
+ (apply error msg args))
(define (parse-int port val)
(let ((num (string->number val)))
@@ -139,10 +137,11 @@
(let ((addrinfo (car (getaddrinfo "localhost" (number->string 11211)))))
(let lp ((n 0))
(when (< n num-clients)
- (spawn
+ (spawn-fiber
(lambda ()
(client-loop addrinfo n num-connections)))
- (lp (1+ n)))))
- (run))
+ (lp (1+ n))))))
-(apply run-memcached-test (map string->number (cdr (program-arguments))))
+(run-fibers
+ (lambda ()
+ (apply run-memcached-test (map string->number (cdr (program-arguments))))))
diff --git a/examples/memcached-server.scm b/examples/memcached-server.scm
index 7add45f..26cca5d 100644
--- a/examples/memcached-server.scm
+++ b/examples/memcached-server.scm
@@ -37,10 +37,8 @@
sock))
(define (client-error port msg . args)
- (put-string port (apply format #f msg args))
- (put-string port "\r\n")
(close-port port)
- (suspend))
+ (apply error msg args))
(define (parse-int port val)
(let ((num (string->number val)))
@@ -130,7 +128,8 @@
(set-nonblocking! client)
;; Disable Nagle's algorithm. We buffer ourselves.
(setsockopt client IPPROTO_TCP TCP_NODELAY 0)
- (spawn (lambda () (client-loop client addr store)))
+ (spawn-fiber
+ (lambda () (client-loop client addr store)))
(loop)))))
(define* (run-memcached #:key
@@ -143,9 +142,6 @@
(socket (make-default-socket family addr port)))
(listen socket 128)
(sigaction SIGPIPE SIG_IGN)
- (spawn
- (lambda ()
- (socket-loop socket (make-hash-table))))
- (run))
+ (socket-loop socket (make-hash-table)))
-(run-memcached)
+(run-fibers run-memcached)
diff --git a/examples/ping-client.scm b/examples/ping-client.scm
index 60e5738..6b8dd79 100644
--- a/examples/ping-client.scm
+++ b/examples/ping-client.scm
@@ -28,12 +28,6 @@
(fcntl port F_SETFL (logior O_NONBLOCK (fcntl port F_GETFL)))
(setvbuf port 'block 1024))
-(define (server-error port msg . args)
- (apply format (current-error-port) msg args)
- (newline (current-error-port))
- (close-port port)
- (suspend))
-
(define (connect-to-server addrinfo)
(let ((port (socket (addrinfo:fam addrinfo)
(addrinfo:socktype addrinfo)
@@ -57,7 +51,8 @@
(force-output port)
(let ((response (read-line port)))
(unless (equal? test response)
- (server-error port "Bad response: ~A (expected ~A)" response test))
+ (close-port port)
+ (error "Bad response: ~A (expected ~A)" response test))
(lp (1+ m)))))
(close-port port))
(set! *active-clients* (1- *active-clients*))
@@ -70,10 +65,11 @@
(let ((addrinfo (car (getaddrinfo "localhost" (number->string 11211)))))
(let lp ((n 0))
(when (< n num-clients)
- (spawn
+ (spawn-fiber
(lambda ()
(client-loop addrinfo n num-connections)))
- (lp (1+ n)))))
- (run))
+ (lp (1+ n))))))
-(apply run-ping-test (map string->number (cdr (program-arguments))))
+(run-fibers
+ (lambda ()
+ (apply run-ping-test (map string->number (cdr (program-arguments))))))
diff --git a/examples/ping-server.scm b/examples/ping-server.scm
index 9e28925..8ddd10e 100644
--- a/examples/ping-server.scm
+++ b/examples/ping-server.scm
@@ -56,7 +56,7 @@
(set-nonblocking! client)
;; Disable Nagle's algorithm. We buffer ourselves.
(setsockopt client IPPROTO_TCP TCP_NODELAY 0)
- (spawn (lambda () (client-loop client addr store)))
+ (spawn-fiber (lambda () (client-loop client addr store)))
(loop)))))
(define* (run-ping-server #:key
@@ -69,9 +69,6 @@
(socket (make-default-socket family addr port)))
(listen socket 1024)
(sigaction SIGPIPE SIG_IGN)
- (spawn
- (lambda ()
- (socket-loop socket (make-hash-table))))
- (run))
+ (socket-loop socket (make-hash-table)))
-(run-ping-server)
+(run-fibers run-ping-server)
diff --git a/fibers.scm b/fibers.scm
index d6699d2..f70a6e4 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -21,270 +21,58 @@
#:use-module ((srfi srfi-1) #:select (append-reverse!))
#:use-module (srfi srfi-9)
#:use-module (fibers epoll)
+ #:use-module (fibers internal)
#:use-module (ice-9 fdes-finalizers)
#:use-module (ice-9 match)
#:use-module (ice-9 ports internal)
#:use-module (ice-9 suspendable-ports)
- #:replace (sleep)
- #:export (;; Low-level interface: contexts and threads.
- make-scheduler
- current-scheduler
- ensure-current-scheduler
- destroy-scheduler
+ #:export ((get-current-fiber . current-fiber)
+ run-fibers
+ spawn-fiber
+ kill-fiber)
+ #:replace (sleep))
- create-fiber
- current-fiber
- kill-fiber
- fiber-state
+;; A thunk and not a parameter to prevent users from using it as a
+;; parameter.
+(define (get-current-fiber)
+ "Return the current fiber, or @code{#f} if no fiber is current."
+ (current-fiber))
- ;; High-level interface.
- run
- spawn
- suspend
- resume
- ;; sleep is #:replace'd; see above
- ))
-
-(define-record-type <scheduler>
- (%make-scheduler epfd prompt-tag runnables sources sleepers)
- nio?
- (epfd scheduler-epfd)
- (prompt-tag scheduler-prompt-tag)
- ;; (fiber ...)
- (runnables scheduler-runnables set-scheduler-runnables!)
- ;; fd -> ((total-events . min-expiry) #(events expiry fiber) ...)
- (sources scheduler-sources)
- ;; ((fiber . expiry) ...)
- (sleepers scheduler-sleepers set-scheduler-sleepers!))
-
-(define-record-type <fiber>
- (make-fiber state data)
- fiber?
- ;; One of: runnable, running, suspended, finished.
- (state fiber-state set-fiber-state!)
- ;; State-specific data. For runnable, a thunk; for running, nothing;
- ;; for suspended, a continuation; for finished, a list of values.
- (data fiber-data set-fiber-data!))
-
-(define (make-scheduler)
- (%make-scheduler (epoll-create) (make-prompt-tag "fibers")
- '() (make-hash-table) '()))
-
-(define current-scheduler (make-parameter #f))
-(define (ensure-current-scheduler)
- (let ((ctx (current-scheduler)))
- (or ctx
- (begin
- (current-scheduler (make-scheduler))
- (ensure-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))
-(define (source-fiber s) (vector-ref s 2))
-
-(define current-fiber (make-parameter #f))
-
-(define (schedule-fiber! ctx fiber thunk)
- (when (eq? (fiber-state fiber) 'suspended)
- (set-fiber-state! fiber 'runnable)
- (set-fiber-data! fiber thunk)
- (let ((runnables (scheduler-runnables ctx)))
- (set-scheduler-runnables! ctx (cons fiber runnables)))))
-
-(define internal-time-units-per-millisecond
- (/ internal-time-units-per-second 1000))
-
-(define (schedule-fibers-for-fd fd revents ctx)
- (let ((sources (hashv-ref (scheduler-sources ctx) fd)))
- (for-each (lambda (source)
- ;; FIXME: If we were waiting with a timeout, this
- ;; fiber might still be in "sleepers", and we should
- ;; probably remove it. Currently we don't do timed
- ;; waits though, only sleeps.
- (unless (zero? (logand revents
- (logior (source-events source) EPOLLERR)))
- (resume (source-fiber source) (lambda () revents) ctx)))
- (cdr sources))
- (cond
- ((zero? (logand revents EPOLLERR))
- (hashv-remove! (scheduler-sources ctx) fd)
- (epoll-remove! (scheduler-epfd ctx) fd))
- (else
- (set-cdr! sources '())
- ;; Reset active events and expiration time, respectively.
- (set-car! (car sources) #f)
- (set-cdr! (car sources) #f)))))
-
-(define (poll-for-events ctx)
- ;; Called when the runnables list is empty. Poll for some active
- ;; FD's and schedule their corresponding fibers. Also schedule any
- ;; sleepers that have timed out.
- (let ((sleepers (scheduler-sleepers ctx)))
- (epoll (scheduler-epfd ctx)
- 32 ; maxevents
- (match sleepers
- ;; The sleepers list is sorted so the first element
- ;; should be the one whose wake time is soonest.
- (((fiber . expiry) . sleepers)
- (let ((now (get-internal-real-time)))
- (if (< expiry now)
- 0
- (round/ (- expiry now)
- internal-time-units-per-millisecond))))
- (_ -1))
- #:folder (lambda (fd revents seed)
- (schedule-fibers-for-fd fd revents ctx)
- seed))
- (let ((now (get-internal-real-time)))
- ;; Resume fibers whose sleep has timed out. Do it in such a way
- ;; that the one with the earliest expiry is resumed last, so
- ;; that it will will end up first on the runnable list. If one
- ;; of these fibers has already been resumed (perhaps because the
- ;; fd is readable or writable), this resume will have no effect.
- (let wake-sleepers ((sleepers sleepers) (wakers '()))
- (if (and (pair? sleepers) (>= now (cdar sleepers)))
- (wake-sleepers (cdr sleepers) (cons (caar sleepers) wakers))
- (begin
- (set-scheduler-sleepers! ctx sleepers)
- (for-each (lambda (fiber)
- (resume fiber (lambda () 0) ctx))
- wakers)))))))
-
-(define (run-fiber ctx fiber)
- (when (eq? (fiber-state fiber) 'runnable)
- (parameterize ((current-fiber fiber))
- (call-with-prompt
- (scheduler-prompt-tag ctx)
- (lambda ()
- (let ((thunk (fiber-data fiber)))
- (set-fiber-state! fiber 'running)
- (set-fiber-data! fiber #f)
- (thunk)))
- (lambda (k after-suspend)
- (set-fiber-state! fiber 'suspended)
- (set-fiber-data! fiber k)
- (after-suspend ctx fiber))))))
-
-(define (destroy-scheduler ctx)
- #;
- (for-each kill-fiber (list-copy (scheduler-fibers ctx)))
- (epoll-destroy (scheduler-epfd ctx)))
-
-(define (create-fiber ctx thunk)
- (let ((fiber (make-fiber 'suspended #f)))
- (schedule-fiber! ctx
- fiber
- (lambda ()
- (call-with-values thunk
- (lambda results
- (set-fiber-state! fiber 'finished)
- (set-fiber-data! fiber results)))))
- fiber))
-
-(define (kill-fiber fiber)
- (pk 'kill-fiber fiber))
-
-;; The AFTER-SUSPEND thunk allows the user to suspend the current
-;; fiber, saving its state, and then perform some other nonlocal
-;; control flow.
-;;
-(define* (suspend #:optional (after-suspend (lambda (ctx fiber) #f)))
- ((abort-to-prompt (scheduler-prompt-tag (current-scheduler))
- after-suspend)))
-
-;; FIXME: `resume' should get scheduler from fiber, and if it's not
-;; the current scheduler it should add to the remote scheduler's
-;; landing pad, an atomic queue that is processed by the remote
-;; scheduler at its leisure.
-
-(define* (resume fiber thunk #:optional (ctx (ensure-current-scheduler)))
- (let* ((cont (fiber-data fiber))
- (thunk (lambda () (cont thunk))))
- (schedule-fiber! ctx fiber thunk)))
-
-(define* (run #:optional (ctx (ensure-current-scheduler))
- #:key (install-suspendable-ports? #t))
- (when install-suspendable-ports? (install-suspendable-ports!))
- (parameterize ((current-scheduler ctx)
- (current-read-waiter wait-for-readable)
- (current-write-waiter wait-for-writable))
- (let lp ()
- (let ((runnables (scheduler-runnables ctx)))
- (cond
- ((pair? runnables)
- (let ((fiber (car runnables)))
- (set-scheduler-runnables! ctx (cdr runnables))
- (run-fiber ctx fiber)
- (lp)))
- ((poll-for-events ctx)
- (lp))
- (else
- ;; Nothing runnable; quit.
- (values)))))))
-
-(define* (spawn thunk #:optional (ctx (ensure-current-scheduler)))
- (create-fiber ctx thunk))
+(define (wait-for-events port fd events)
+ (let ((revents (suspend-current-fiber
+ (lambda (fiber)
+ (add-fd-events! (fiber-scheduler fiber) fd events fiber)))))
+ (unless (zero? (logand revents EPOLLERR))
+ (error "error reading from port" port))))
(define (wait-for-readable port)
(wait-for-events port (port-read-wait-fd port) (logior EPOLLIN EPOLLRDHUP)))
-
(define (wait-for-writable port)
(wait-for-events port (port-write-wait-fd port) EPOLLOUT))
-(define (handle-events port events revents)
- (unless (zero? (logand revents EPOLLERR))
- (error "error reading from port" port)))
+(define* (run-fibers #:optional (init #f)
+ #:key (scheduler (make-scheduler))
+ (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))
+ (when init (spawn-fiber init scheduler))
+ (run-scheduler scheduler))
+ (unless keep-scheduler? (destroy-scheduler scheduler)))
-(define (finalize-fd ctx fd)
- "Remove data associated with @var{fd} from the scheduler @var{ctx}.
-Called by Guile just before Guile goes to close a file descriptor, in
-response either to an explicit call to @code{close-port}, or because
-the port became unreachable. In the latter case, this call may come
-from a finalizer thread."
- ;; When a file descriptor is closed, the kernel silently removes it
- ;; from any associated epoll sets, so we don't need to do anything
- ;; there.
- ;;
- ;; FIXME: Take a lock on the sources table?
- ;; FIXME: Wake all sources with EPOLLERR.
- (hashv-remove! (scheduler-sources ctx) fd))
+(define (require-current-scheduler)
+ (or (current-scheduler)
+ (error "No scheduler current; call within run-fibers instead")))
-(define (wait-for-events port fd events)
- (handle-events
- port
- events
- (suspend
- (lambda (ctx fiber)
- (let ((sources (hashv-ref (scheduler-sources ctx) fd)))
- (cond
- (sources
- (set-cdr! sources (cons (make-source events #f fiber) (cdr sources)))
- (let ((active-events (caar sources)))
- (unless (and active-events
- (= (logand events active-events) events))
- (set-car! (car sources) (logior events (or active-events 0)))
- (epoll-modify! (scheduler-epfd ctx) fd
- (logior (caar sources) EPOLLONESHOT)))))
- (else
- (hashv-set! (scheduler-sources ctx)
- fd (acons events #f
- (list (make-source events #f fiber))))
- (add-fdes-finalizer! fd (lambda (fd) (finalize-fd ctx fd)))
- (epoll-add! (scheduler-epfd ctx) fd (logior events EPOLLONESHOT)))))))))
+(define* (spawn-fiber thunk #:optional (sched (require-current-scheduler)))
+ (create-fiber sched thunk))
-(define (add-sleeper! ctx fiber seconds)
- (let ((waketime (+ (get-internal-real-time)
- (inexact->exact
- (round (* seconds internal-time-units-per-second))))))
- (let lp ((head '()) (tail (scheduler-sleepers ctx)))
- (if (and (pair? tail) (> waketime (cdar tail)))
- (lp (cons (car tail) head) (cdr tail))
- (set-scheduler-sleepers!
- ctx
- (append-reverse! head (acons fiber waketime tail)))))))
+(define (kill-fiber fiber)
+ (pk 'unimplemented-kill-fiber fiber))
(define (sleep seconds)
- (suspend
- (lambda (ctx fiber)
- (add-sleeper! ctx fiber seconds))))
+ (suspend-current-fiber
+ (lambda (fiber)
+ (add-sleeper! (fiber-scheduler fiber) fiber seconds))))
diff --git a/fibers/channels.scm b/fibers/channels.scm
index 7f3fee6..18f59d2 100644
--- a/fibers/channels.scm
+++ b/fibers/channels.scm
@@ -22,14 +22,13 @@
#:use-module (srfi srfi-9 gnu)
#:use-module (ice-9 atomic)
#:use-module (ice-9 match)
- #:use-module (fibers) ;; fixme, eliminate cycle
+ #:use-module (fibers internal)
#:export (channel?
make-channel
put-message
get-message))
-
(define-record-type <read-wait-queue>
(make-read-wait-queue waiters)
read-wait-queue?
@@ -74,17 +73,18 @@
(commit (append old-state (list message)) values)
(commit (make-write-wait-queue old-state (list (current-fiber)))
(lambda ()
- (suspend)
+ (suspend-current-fiber)
(retry (atomic-box-ref state))))))
(($ <read-wait-queue> waiters)
(commit (list message)
(lambda ()
- (for-each (lambda (fiber) (resume fiber values)) waiters)
+ (for-each (lambda (fiber) (resume-fiber fiber values))
+ waiters)
(values))))
(($ <write-wait-queue> messages waiters)
(commit (make-write-wait-queue messages (cons (current-fiber) waiters))
(lambda ()
- (suspend)
+ (suspend-current-fiber)
(retry (atomic-box-ref state))))))))))
(define (get-message channel)
@@ -98,17 +98,18 @@
(()
(commit (make-read-wait-queue (list (current-fiber)))
(lambda ()
- (suspend)
+ (suspend-current-fiber)
(retry (atomic-box-ref state)))))
((message . messages)
(commit messages (lambda () message)))
(($ <read-wait-queue> waiters)
(commit (make-read-wait-queue (cons (current-fiber) waiters))
(lambda ()
- (suspend)
+ (suspend-current-fiber)
(retry (atomic-box-ref state)))))
(($ <write-wait-queue> (message . messages) waiters)
(commit messages
(lambda ()
- (for-each (lambda (fiber) (resume fiber values)) waiters)
+ (for-each (lambda (fiber) (resume-fiber fiber values))
+ waiters)
message))))))))
diff --git a/fibers/internal.scm b/fibers/internal.scm
new file mode 100644
index 0000000..d7f4108
--- /dev/null
+++ b/fibers/internal.scm
@@ -0,0 +1,256 @@
+;; Fibers: cooperative, event-driven user-space threads.
+
+;;;; Copyright (C) 2016 Free Software Foundation, Inc.
+;;;;
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
+;;;;
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;;; Lesser General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;;;;
+
+(define-module (fibers internal)
+ #:use-module ((srfi srfi-1) #:select (append-reverse!))
+ #:use-module (srfi srfi-9)
+ #:use-module (fibers epoll)
+ #:use-module (ice-9 fdes-finalizers)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 suspendable-ports)
+ #:replace (sleep)
+ #:export (;; Low-level interface: schedulers and threads.
+ make-scheduler
+ current-scheduler
+ run-scheduler
+ destroy-scheduler
+ add-fd-events!
+ add-sleeper!
+
+ create-fiber
+ current-fiber
+ kill-fiber
+ fiber-scheduler
+ fiber-state
+
+ suspend-current-fiber
+ resume-fiber))
+
+(define-record-type <scheduler>
+ (%make-scheduler epfd prompt-tag runnables sources sleepers)
+ nio?
+ (epfd scheduler-epfd)
+ (prompt-tag scheduler-prompt-tag)
+ ;; (fiber ...)
+ (runnables scheduler-runnables set-scheduler-runnables!)
+ ;; fd -> ((total-events . min-expiry) #(events expiry fiber) ...)
+ (sources scheduler-sources)
+ ;; ((fiber . expiry) ...)
+ (sleepers scheduler-sleepers set-scheduler-sleepers!))
+
+(define-record-type <fiber>
+ (make-fiber state scheduler data)
+ fiber?
+ ;; One of: runnable, running, suspended, finished.
+ (state fiber-state set-fiber-state!)
+ ;; The scheduler that a fiber runs in. As a scheduler only runs in
+ ;; one kernel thread, this binds a fiber to a kernel thread.
+ (scheduler fiber-scheduler)
+ ;; State-specific data. For runnable, a thunk; for running, nothing;
+ ;; for suspended, a continuation; for finished, a list of values.
+ (data fiber-data set-fiber-data!))
+
+(define (make-scheduler)
+ (%make-scheduler (epoll-create) (make-prompt-tag "fibers")
+ '() (make-hash-table) '()))
+
+(define current-scheduler (make-parameter #f))
+(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))
+(define (source-fiber s) (vector-ref s 2))
+
+(define current-fiber (make-parameter #f))
+
+(define (schedule-fiber! sched fiber thunk)
+ (when (eq? (fiber-state fiber) 'suspended)
+ (set-fiber-state! fiber 'runnable)
+ (set-fiber-data! fiber thunk)
+ (let ((runnables (scheduler-runnables sched)))
+ (set-scheduler-runnables! sched (cons fiber runnables)))))
+
+(define internal-time-units-per-millisecond
+ (/ internal-time-units-per-second 1000))
+
+(define (schedule-fibers-for-fd fd revents sched)
+ (let ((sources (hashv-ref (scheduler-sources sched) fd)))
+ (for-each (lambda (source)
+ ;; FIXME: If we were waiting with a timeout, this
+ ;; fiber might still be in "sleepers", and we should
+ ;; probably remove it. Currently we don't do timed
+ ;; waits though, only sleeps.
+ (unless (zero? (logand revents
+ (logior (source-events source) EPOLLERR)))
+ (resume-fiber (source-fiber source) (lambda () revents))))
+ (cdr sources))
+ (cond
+ ((zero? (logand revents EPOLLERR))
+ (hashv-remove! (scheduler-sources sched) fd)
+ (epoll-remove! (scheduler-epfd sched) fd))
+ (else
+ (set-cdr! sources '())
+ ;; Reset active events and expiration time, respectively.
+ (set-car! (car sources) #f)
+ (set-cdr! (car sources) #f)))))
+
+(define (poll-for-events sched)
+ ;; Called when the runnables list is empty. Poll for some active
+ ;; FD's and schedule their corresponding fibers. Also schedule any
+ ;; sleepers that have timed out.
+ (let ((sleepers (scheduler-sleepers sched)))
+ (epoll (scheduler-epfd sched)
+ 32 ; maxevents
+ (match sleepers
+ ;; The sleepers list is sorted so the first element
+ ;; should be the one whose wake time is soonest.
+ (((fiber . expiry) . sleepers)
+ (let ((now (get-internal-real-time)))
+ (if (< expiry now)
+ 0
+ (round/ (- expiry now)
+ internal-time-units-per-millisecond))))
+ (_ -1))
+ #:folder (lambda (fd revents seed)
+ (schedule-fibers-for-fd fd revents sched)
+ seed))
+ (let ((now (get-internal-real-time)))
+ ;; Resume fibers whose sleep has timed out. Do it in such a way
+ ;; that the one with the earliest expiry is resumed last, so
+ ;; that it will will end up first on the runnable list. If one
+ ;; of these fibers has already been resumed (perhaps because the
+ ;; fd is readable or writable), this resume will have no effect.
+ (let wake-sleepers ((sleepers sleepers) (wakers '()))
+ (if (and (pair? sleepers) (>= now (cdar sleepers)))
+ (wake-sleepers (cdr sleepers) (cons (caar sleepers) wakers))
+ (begin
+ (set-scheduler-sleepers! sched sleepers)
+ (for-each (lambda (fiber)
+ (resume-fiber fiber (lambda () 0)))
+ wakers)))))))
+
+(define* (run-fiber sched fiber)
+ (when (eq? (fiber-state fiber) 'runnable)
+ (parameterize ((current-fiber fiber))
+ (call-with-prompt
+ (scheduler-prompt-tag sched)
+ (lambda ()
+ (let ((thunk (fiber-data fiber)))
+ (set-fiber-state! fiber 'running)
+ (set-fiber-data! fiber #f)
+ (thunk)))
+ (lambda (k after-suspend)
+ (set-fiber-state! fiber 'suspended)
+ (set-fiber-data! fiber k)
+ (after-suspend fiber))))))
+
+(define (run-scheduler sched)
+ (let lp ()
+ (let ((runnables (scheduler-runnables sched)))
+ (cond
+ ((pair? runnables)
+ (let ((fiber (car runnables)))
+ (set-scheduler-runnables! sched (cdr runnables))
+ (run-fiber sched fiber)
+ (lp)))
+ ((poll-for-events sched)
+ (lp))
+ (else
+ ;; Nothing runnable; quit.
+ (values))))))
+
+(define (destroy-scheduler sched)
+ #;
+ (for-each kill-fiber (list-copy (scheduler-fibers sched)))
+ (epoll-destroy (scheduler-epfd sched)))
+
+(define (create-fiber sched thunk)
+ (let ((fiber (make-fiber 'suspended sched #f)))
+ (schedule-fiber! sched
+ fiber
+ (lambda ()
+ (call-with-values thunk
+ (lambda results
+ (set-fiber-state! fiber 'finished)
+ (set-fiber-data! fiber results)))))
+ fiber))
+
+(define (kill-fiber fiber)
+ (pk 'kill-fiber fiber))
+
+;; The AFTER-SUSPEND thunk allows the user to suspend the current
+;; fiber, saving its state, and then perform some other nonlocal
+;; control flow.
+;;
+(define* (suspend-current-fiber #:optional
+ (after-suspend (lambda (fiber) #f)))
+ ((abort-to-prompt (scheduler-prompt-tag (current-scheduler))
+ after-suspend)))
+
+;; FIXME: `resume' should get scheduler from fiber, and if it's not
+;; the current scheduler it should add to the remote scheduler's
+;; landing pad, an atomic queue that is processed by the remote
+;; scheduler at its leisure.
+
+(define* (resume-fiber fiber thunk)
+ (let* ((cont (fiber-data fiber))
+ (thunk (lambda () (cont thunk))))
+ (schedule-fiber! (fiber-scheduler fiber) fiber thunk)))
+
+(define (finalize-fd ctx fd)
+ "Remove data associated with @var{fd} from the scheduler @var{ctx}.
+Called by Guile just before Guile goes to close a file descriptor, in
+response either to an explicit call to @code{close-port}, or because
+the port became unreachable. In the latter case, this call may come
+from a finalizer thread."
+ ;; When a file descriptor is closed, the kernel silently removes it
+ ;; from any associated epoll sets, so we don't need to do anything
+ ;; there.
+ ;;
+ ;; FIXME: Take a lock on the sources table?
+ ;; FIXME: Wake all sources with EPOLLERR.
+ (hashv-remove! (scheduler-sources ctx) fd))
+
+(define (add-fd-events! sched fd events fiber)
+ (let ((sources (hashv-ref (scheduler-sources sched) fd)))
+ (cond
+ (sources
+ (set-cdr! sources (cons (make-source events #f fiber) (cdr sources)))
+ (let ((active-events (caar sources)))
+ (unless (and active-events
+ (= (logand events active-events) events))
+ (set-car! (car sources) (logior events (or active-events 0)))
+ (epoll-modify! (scheduler-epfd sched) fd
+ (logior (caar sources) EPOLLONESHOT)))))
+ (else
+ (hashv-set! (scheduler-sources sched)
+ fd (acons events #f
+ (list (make-source events #f fiber))))
+ (add-fdes-finalizer! fd (lambda (fd) (finalize-fd sched fd)))
+ (epoll-add! (scheduler-epfd sched) fd (logior events EPOLLONESHOT))))))
+
+(define (add-sleeper! sched fiber seconds)
+ (let ((waketime (+ (get-internal-real-time)
+ (inexact->exact
+ (round (* seconds internal-time-units-per-second))))))
+ (let lp ((head '()) (tail (scheduler-sleepers sched)))
+ (if (and (pair? tail) (> waketime (cdar tail)))
+ (lp (cons (car tail) head) (cdr tail))
+ (set-scheduler-sleepers!
+ sched
+ (append-reverse! head (acons fiber waketime tail)))))))
diff --git a/web/server/fibers.scm b/web/server/fibers.scm
index 9410581..f8d6ae2 100644
--- a/web/server/fibers.scm
+++ b/web/server/fibers.scm
@@ -34,7 +34,12 @@
#:use-module (ice-9 binary-ports)
#:use-module (ice-9 suspendable-ports)
#:use-module (ice-9 match)
- #:use-module (fibers))
+ #:use-module (fibers)
+ #:use-module ((fibers internal)
+ #:select (make-scheduler
+ destroy-scheduler
+ suspend-current-fiber
+ resume-fiber)))
(define (set-nonblocking! port)
(fcntl port F_SETFL (logior O_NONBLOCK (fcntl port F_GETFL)))
@@ -71,9 +76,9 @@
(listen socket 1024)
(set-nonblocking! socket)
(sigaction SIGPIPE SIG_IGN)
- (let* ((ctx (make-scheduler))
- (server (make-server ctx (make-prompt-tag "have-request"))))
- (spawn (lambda () (socket-loop server socket)) ctx)
+ (let* ((sched (make-scheduler))
+ (server (make-server sched (make-prompt-tag "have-request"))))
+ (spawn-fiber (lambda () (socket-loop server socket)) sched)
server))
(define (bad-request msg . args)
@@ -104,8 +109,8 @@
(lambda ()
(let* ((request (read-request client))
(body (read-request-body request)))
- (suspend
- (lambda (ctx fiber)
+ (suspend-current-fiber
+ (lambda (fiber)
(have-request fiber request body)))))
(lambda (key . args)
(display "While reading request:\n" (current-error-port))
@@ -144,7 +149,7 @@
;; TCP_NODELAY is not defined on this platform.
(false-if-exception
(setsockopt client IPPROTO_TCP TCP_NODELAY 0))
- (spawn (lambda () (client-loop client have-request)))
+ (spawn-fiber (lambda () (client-loop client have-request)))
(loop)))))
;; -> (client request body | #f #f #f)
@@ -152,13 +157,15 @@
(call-with-prompt
(server-have-request-prompt server)
(lambda ()
- (run (server-scheduler server)))
+ (run-fibers #:scheduler (server-scheduler server)
+ #:install-suspendable-ports? #f
+ #:keep-scheduler? #t))
(lambda (k client request body)
(values client request body))))
;; -> 0 values
(define (server-write server client response body)
- (resume client (lambda () (values response body)) (server-scheduler server))
+ (resume-fiber client (lambda () (values response body)))
(values))
;; -> unspecified values