X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fthread.lisp;h=4c688bf2b0e7b1d7027b7f9351c0daf53410186e;hb=d6f9676ae94419cb5544c45821a8d31adbc1fbe8;hp=887ef3e93c5172fe84b198aebcdb4d71eab93871;hpb=00616528986d795d1335a0591371e1ac9d958eed;p=sbcl.git

diff --git a/src/code/thread.lisp b/src/code/thread.lisp
index 887ef3e..4c688bf 100644
--- a/src/code/thread.lisp
+++ b/src/code/thread.lisp
@@ -21,7 +21,6 @@ in future versions."
   (name          nil :type (or thread-name null))
   (%alive-p      nil :type boolean)
   (os-thread     nil :type (or integer null))
-  (whostate      nil :type (or null simple-string))
   (interruptions nil :type list)
   (result        nil :type list)
   (interruptions-lock
@@ -29,17 +28,16 @@ in future versions."
    :type mutex)
   (result-lock
    (make-mutex :name "thread result lock")
-   :type mutex))
+   :type mutex)
+  waiting-for)
 
 (def!struct mutex
   #!+sb-doc
   "Mutex type."
   (name   nil :type (or null thread-name))
   (%owner nil :type (or null thread))
-  #!+(and (not sb-lutex) sb-thread)
-  (state    0 :type fixnum)
-  #!+(and sb-lutex sb-thread)
-  (lutex (make-lutex)))
+  #!+(and sb-thread sb-futex)
+  (state    0 :type fixnum))
 
 (defun mutex-value (mutex)
   "Current owner of the mutex, NIL if the mutex is free. May return a
@@ -71,6 +69,26 @@ stale value, use MUTEX-OWNER instead."
   (name  nil :type (or null thread-name))
   (value nil))
 
+(sb!xc:defmacro without-thread-waiting-for ((&key already-without-interrupts) &body body)
+  (with-unique-names (thread prev)
+    (let ((without (if already-without-interrupts
+                       'progn
+                       'without-interrupts))
+          (with (if already-without-interrupts
+                    'progn
+                    'with-local-interrupts)))
+      `(let* ((,thread *current-thread*)
+              (,prev (thread-waiting-for ,thread)))
+         (flet ((exec () ,@body))
+           (if ,prev
+               (,without
+                (unwind-protect
+                     (progn
+                       (setf (thread-waiting-for ,thread) nil)
+                       (,with (exec)))
+                  (setf (thread-waiting-for ,thread) ,prev)))
+               (exec)))))))
+
 (sb!xc:defmacro with-mutex ((mutex &key (value '*current-thread*) (wait-p t))
                             &body body)
   #!+sb-doc