X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-thread.lisp;fp=src%2Fcode%2Ftarget-thread.lisp;h=a79774155218aaa0fd2ba4e66e0a8b035429d70b;hb=b8846766dd1ecb2b6c3dce848f2aae0b3b11a6ea;hp=80e3fee033462296f2641166714154efc441f8ab;hpb=a5e4dbccec61eec3dcce99b7ad82d09ada64dab3;p=sbcl.git diff --git a/src/code/target-thread.lisp b/src/code/target-thread.lisp index 80e3fee..a797741 100644 --- a/src/code/target-thread.lisp +++ b/src/code/target-thread.lisp @@ -1384,7 +1384,7 @@ have the foreground next." (setf (thread-os-thread thread) (current-thread-os-thread)) (with-mutex ((thread-result-lock thread)) (with-all-threads-lock - (push thread *all-threads*)) + (push thread *all-threads*)) (with-session-lock (*session*) (push thread (session-threads *session*))) (setf (thread-%alive-p thread) t) @@ -1449,32 +1449,31 @@ See also: RETURN-FROM-THREAD, ABORT-THREAD." 'make-thread arguments) #!+sb-thread (let ((thread (%make-thread :name name :%ephemeral-p ephemeral))) - (with-mutex (*make-thread-lock*) - (let* ((setup-sem (make-semaphore :name "Thread setup semaphore")) - (real-function (coerce function 'function)) - (arguments (if (listp arguments) - arguments - (list arguments))) - (initial-function - (named-lambda initial-thread-function () - ;; As it is, this lambda must not cons until we are ready - ;; to run GC. Be very careful. - (initial-thread-function-trampoline - thread setup-sem real-function arguments nil nil nil)))) - ;; If the starting thread is stopped for gc before it signals the - ;; semaphore then we'd be stuck. - (assert (not *gc-inhibit*)) - ;; Keep INITIAL-FUNCTION pinned until the child thread is - ;; initialized properly. Wrap the whole thing in - ;; WITHOUT-INTERRUPTS because we pass INITIAL-FUNCTION to another - ;; thread. - (without-interrupts - (with-pinned-objects (initial-function) - (if (zerop - (%create-thread (get-lisp-obj-address initial-function))) - (setf thread nil) - (wait-on-semaphore setup-sem)))))) - (or thread (error "Could not create a new thread.")))) + (let* ((setup-sem (make-semaphore :name "Thread setup semaphore")) + (real-function (coerce function 'function)) + (arguments (if (listp arguments) + arguments + (list arguments))) + (initial-function + (named-lambda initial-thread-function () + ;; As it is, this lambda must not cons until we are + ;; ready to run GC. Be very careful. + (initial-thread-function-trampoline + thread setup-sem real-function arguments nil nil nil)))) + ;; If the starting thread is stopped for gc before it signals + ;; the semaphore then we'd be stuck. + (assert (not *gc-inhibit*)) + ;; Keep INITIAL-FUNCTION pinned until the child thread is + ;; initialized properly. Wrap the whole thing in + ;; WITHOUT-INTERRUPTS because we pass INITIAL-FUNCTION to + ;; another thread. + (with-system-mutex (*make-thread-lock*) + (with-pinned-objects (initial-function) + (if (zerop + (%create-thread (get-lisp-obj-address initial-function))) + (setf thread nil) + (wait-on-semaphore setup-sem))))) + (or thread (error "Could not create a new thread.")))) (defun join-thread (thread &key (default nil defaultp) timeout) #!+sb-doc