From 1dd4dd079b5477069582a7596d34a56d2cdd75be Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Thu, 6 Nov 2014 01:39:15 +0000 Subject: [PATCH] Inherit the root thread continuation. Fixes : nested CREATE-THREADs sometimes see an unassigned root continuation. --- src/runtime/thread.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/runtime/thread.scm b/src/runtime/thread.scm index 5706478d4..222a88a85 100644 --- a/src/runtime/thread.scm +++ b/src/runtime/thread.scm @@ -138,21 +138,22 @@ USA. (error:wrong-type-argument root-continuation "continuation or #f" create-thread)) - (call-with-current-continuation - (lambda (return) - (%within-continuation (or root-continuation - (fluid root-continuation-default)) - #t - (lambda () - (fluid-let ((state-space:local (make-state-space))) - (call-with-current-continuation - (lambda (continuation) - (let ((thread (make-thread continuation))) - (%within-continuation (let ((k return)) (set! return #f) k) - #t - (lambda () thread))))) - (set-interrupt-enables! interrupt-mask/all) - (exit-current-thread (thunk)))))))) + (let ((root-continuation + (or root-continuation (fluid root-continuation-default)))) + (call-with-current-continuation + (lambda (return) + (%within-continuation root-continuation #t + (lambda () + (fluid-let ((state-space:local (make-state-space))) + (call-with-current-continuation + (lambda (continuation) + (let ((thread (make-thread continuation))) + (%within-continuation (let ((k return)) (set! return #f) k) + #t + (lambda () thread))))) + (set-interrupt-enables! interrupt-mask/all) + (exit-current-thread + (with-create-thread-continuation root-continuation thunk))))))))) (define (create-thread-continuation) (fluid root-continuation-default)) -- 2.25.1