X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fthread.lisp;h=19f14be7148581904b2e8bc8f77b89e7d4fb7984;hb=568214ddf4c8ecc881caec98e20848d017974ec0;hp=50be15f2bee91cf962df3a12491a7eac6deefdf6;hpb=5a2b6553fbbbb62fa789350facd0d56bb136045f;p=sbcl.git

diff --git a/src/code/thread.lisp b/src/code/thread.lisp
index 50be15f..19f14be 100644
--- a/src/code/thread.lisp
+++ b/src/code/thread.lisp
@@ -1,8 +1,34 @@
+;;;; support for threads needed at cross-compile time
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
 (in-package "SB!THREAD")
 
-(defvar *session-lock*)
+(sb!xc:defmacro with-mutex ((mutex &key value (wait-p t)) &body body)
+  #!-sb-thread (declare (ignore mutex value wait-p))
+  #!+sb-thread
+  (with-unique-names (got)
+    `(let ((,got (get-mutex ,mutex ,value ,wait-p)))
+      (when ,got
+	(unwind-protect
+	     (locally ,@body)
+	  (release-mutex ,mutex)))))
+  ;; KLUDGE: this separate expansion for (NOT SB-THREAD) is not
+  ;; strictly necessary; GET-MUTEX and RELEASE-MUTEX are implemented.
+  ;; However, there would be a (possibly slight) performance hit in
+  ;; using them.
+  #!-sb-thread
+  `(locally ,@body))
 
 (sb!xc:defmacro with-recursive-lock ((mutex) &body body)
+  #!-sb-thread (declare (ignore mutex))
   #!+sb-thread
   (with-unique-names (cfp)
     `(let ((,cfp (sb!kernel:current-fp)))
@@ -19,28 +45,11 @@
 	;; confuse GC completely.  -- CSR, 2003-06-03
 	(get-mutex ,mutex (sb!kernel:make-lisp-obj (sb!sys:sap-int ,cfp))))
       (unwind-protect
-	   (progn ,@body)
+	   (locally ,@body)
 	(when (sb!sys:sap= (sb!sys:int-sap
 			    (sb!kernel:get-lisp-obj-address
 			     (mutex-value ,mutex)))
 			   ,cfp)
 	  (release-mutex ,mutex)))))
   #!-sb-thread
-  `(progn ,@body))
-
-#!+sb-thread
-(defun get-foreground ()
-  (when (not (eql (mutex-value *session-lock*) (current-thread-id)))
-    (get-mutex *session-lock*))
-  (sb!sys:enable-interrupt sb!unix:sigint #'sb!unix::sigint-handler)
-  t)
-#!-sb-thread
-(defun get-foreground () t)
-
-#!+sb-thread
-(defun release-foreground ()
-  (sb!sys:enable-interrupt sb!unix:sigint :ignore)
-  (release-mutex *session-lock*)
-  t)
-#!-sb-thread
-(defun release-foreground () t)
+  `(locally ,@body))