summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-09-20 00:25:12 +0200
committerAndy Wingo <wingo@pobox.com>2016-09-20 00:25:12 +0200
commitb4a350d66360e2275c92ff00f28c3621ca916dd5 (patch)
tree3089f13cf10913fc82f7e2293175a0128704de84
parentAdd fibers and schedulers to namesets (diff)
downloadguile-fibers-b4a350d66360e2275c92ff00f28c3621ca916dd5.tar.gz
Add ,fibers command.
-rw-r--r--Makefile.am3
-rw-r--r--fibers.scm1
-rw-r--r--fibers/internal.scm15
-rw-r--r--fibers/nameset.scm7
-rw-r--r--fibers/repl.scm44
5 files changed, 69 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 3256a36..065f0e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,9 @@ SOURCES = \
fibers/channels.scm \
fibers/epoll.scm \
fibers/internal.scm \
- fibers/psq.scm \
fibers/nameset.scm \
+ fibers/psq.scm \
+ fibers/repl.scm \
web/server/fibers.scm
extlibdir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions
diff --git a/fibers.scm b/fibers.scm
index 9813755..0af520a 100644
--- a/fibers.scm
+++ b/fibers.scm
@@ -20,6 +20,7 @@
(define-module (fibers)
#:use-module (fibers epoll)
#:use-module (fibers internal)
+ #:use-module (fibers repl)
#:use-module ((ice-9 ports internal)
#:select (port-read-wait-fd port-write-wait-fd))
#:use-module (ice-9 suspendable-ports)
diff --git a/fibers/internal.scm b/fibers/internal.scm
index b2b4eac..d65ed1d 100644
--- a/fibers/internal.scm
+++ b/fibers/internal.scm
@@ -43,12 +43,27 @@
fiber-scheduler
fiber-state
+ fold-all-schedulers
+ scheduler-by-name
+ fold-all-fibers
+ fiber-by-name
+
suspend-current-fiber
resume-fiber))
(define-once fibers-nameset (make-nameset))
(define-once schedulers-nameset (make-nameset))
+(define (fold-all-schedulers f seed)
+ (nameset-fold f schedulers-nameset seed))
+(define (scheduler-by-name name)
+ (nameset-ref schedulers-nameset name))
+
+(define (fold-all-fibers f seed)
+ (nameset-fold f fibers-nameset seed))
+(define (fiber-by-name name)
+ (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)
diff --git a/fibers/nameset.scm b/fibers/nameset.scm
index 525151f..312448d 100644
--- a/fibers/nameset.scm
+++ b/fibers/nameset.scm
@@ -24,6 +24,7 @@
#:use-module (srfi srfi-26)
#:export ((make-nameset/public . make-nameset)
nameset-add!
+ nameset-ref
nameset-fold))
(define-syntax struct
@@ -64,6 +65,12 @@ name that was created."
(hashv-set! (nameset-names ns) name obj)
name))
+(define (nameset-ref ns name)
+ "Return the object named @var{name} in nameset @var{ns}, or
+@code{#f} if no such object has that name (perhaps because the object
+was reclaimed by the garbage collector)."
+ (hashv-ref (nameset-names ns) name))
+
(define* (nameset-fold f ns seed)
"Fold @var{f} over the objects contained in the nameset @var{ns}.
This will call @var{f} as @code{(@var{f} @var{name} @var{obj}
diff --git a/fibers/repl.scm b/fibers/repl.scm
new file mode 100644
index 0000000..1a5365d
--- /dev/null
+++ b/fibers/repl.scm
@@ -0,0 +1,44 @@
+;; 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 repl)
+ #:use-module (system repl command)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 format)
+ #:use-module (fibers internal))
+
+(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."
+ (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".
+ (format #t "~a ~8t~a\n" id (fiber-state fiber))))
+ fibers))))