summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-02-08 18:46:46 +0100
committerLudovic Courtès <ludo@gnu.org>2018-02-08 18:46:46 +0100
commitef3801b3ccb3db8e9f2c327015b2aca8cfb67a4e (patch)
treea2e6c24b935e262235de1a5b033cd2d8f6873789
parent8c7c93922bbe0513ff4c4ff3a6e554e3a72635b6 (diff)
downloadcuirass-ef3801b3ccb3db8e9f2c327015b2aca8cfb67a4e.tar
cuirass-ef3801b3ccb3db8e9f2c327015b2aca8cfb67a4e.tar.gz
utils: 'non-blocking' forwards exceptions to the calling fiber.
* src/cuirass/utils.scm (%non-blocking): Forward exceptions to the calling fiber.
-rw-r--r--src/cuirass/utils.scm17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/cuirass/utils.scm b/src/cuirass/utils.scm
index 56dfced..947bf71 100644
--- a/src/cuirass/utils.scm
+++ b/src/cuirass/utils.scm
@@ -71,10 +71,19 @@ value."
(let ((channel (make-channel)))
(call-with-new-thread
(lambda ()
- (call-with-values thunk
- (lambda values
- (put-message channel values)))))
- (apply values (get-message channel))))
+ (catch #t
+ (lambda ()
+ (call-with-values thunk
+ (lambda values
+ (put-message channel `(values ,@values)))))
+ (lambda args
+ (put-message channel `(exception ,@args))))))
+
+ (match (get-message channel)
+ (('values . results)
+ (apply values results))
+ (('exception . args)
+ (apply throw args)))))
(define-syntax-rule (non-blocking exp ...)
"Evalaute EXP... in a separate thread so that it doesn't block the execution