1.0.9.10: make tests clean up after themselves a bit better

[sbcl.git] / src / code / thread.lisp

diff --git a/src/code/thread.lisp b/src/code/thread.lisp
index 4ef2e66..01bbac7 100644 (file)
--- a/src/code/thread.lisp
+++ b/src/code/thread.lisp
@@ -89,7 +89,16 @@ provided the default value is used for the mutex."
         (without-gcing
           (funcall function))
         (without-interrupts
-          (funcall function))))
+          (allow-with-interrupts (funcall function)))))
+
+  (defun call-with-system-spinlock (function spinlock &optional without-gcing-p)
+    (declare (ignore spinlock)
+             (function function))
+    (if without-gcing-p
+        (without-gcing
+          (funcall function))
+        (without-interrupts
+          (allow-with-interrupts (funcall function)))))
 
   (defun call-with-recursive-system-spinlock (function lock
                                               &optional without-gcing-p)
@@ -99,7 +108,7 @@ provided the default value is used for the mutex."
         (without-gcing
           (funcall function))
         (without-interrupts
-          (funcall function))))
+          (allow-with-interrupts (funcall function)))))
 
   (defun call-with-mutex (function mutex value waitp)
     (declare (ignore mutex value waitp)
@@ -119,11 +128,14 @@ provided the default value is used for the mutex."
     (funcall function)))
 
 #!+sb-thread
+;;; KLUDGE: These need to use DX-LET, because the cleanup form that
+;;; closes over GOT-IT causes a value-cell to be allocated for it -- and
+;;; we prefer that to go on the stack since it can.
 (progn
   (defun call-with-system-mutex (function mutex &optional without-gcing-p)
     (declare (function function))
     (flet ((%call-with-system-mutex ()
-             (let (got-it)
+             (dx-let (got-it)
                (unwind-protect
                     (when (setf got-it (get-mutex mutex))
                       (funcall function))
@@ -133,13 +145,29 @@ provided the default value is used for the mutex."
           (without-gcing
             (%call-with-system-mutex))
           (without-interrupts
-            (%call-with-system-mutex)))))
+            (allow-with-interrupts (%call-with-system-mutex))))))
+
+  (defun call-with-system-spinlock (function spinlock &optional without-gcing-p)
+    (declare (function function))
+    (flet ((%call-with-system-spinlock ()
+             (dx-let (got-it)
+               (unwind-protect
+                    (when (setf got-it (get-spinlock spinlock))
+                      (funcall function))
+                 (when got-it
+                   (release-spinlock spinlock))))))
+      (if without-gcing-p
+          (without-gcing
+            (%call-with-system-spinlock))
+          (without-interrupts
+            (allow-with-interrupts (%call-with-system-spinlock))))))
 
-  (defun call-with-recursive-system-spinlock (function lock &optional without-gcing-p)
+  (defun call-with-recursive-system-spinlock (function lock
+                                              &optional without-gcing-p)
     (declare (function function))
     (flet ((%call-with-system-spinlock ()
-             (let ((inner-lock-p (eq *current-thread* (spinlock-value lock)))
-                   (got-it nil))
+             (dx-let ((inner-lock-p (eq *current-thread* (spinlock-value lock)))
+                      (got-it nil))
                (unwind-protect
                     (when (or inner-lock-p (setf got-it (get-spinlock lock)))
                       (funcall function))
@@ -149,11 +177,22 @@ provided the default value is used for the mutex."
           (without-gcing
             (%call-with-system-spinlock))
           (without-interrupts
-            (%call-with-system-spinlock)))))
+            (allow-with-interrupts (%call-with-system-spinlock))))))
+
+  (defun call-with-spinlock (function spinlock)
+    (declare (function function))
+    (dx-let ((got-it nil))
+      (without-interrupts
+        (unwind-protect
+             (when (setf got-it (allow-with-interrupts
+                                 (get-spinlock spinlock)))
+               (with-local-interrupts (funcall function)))
+          (when got-it
+            (release-spinlock spinlock))))))
 
   (defun call-with-mutex (function mutex value waitp)
     (declare (function function))
-    (let ((got-it nil))
+    (dx-let ((got-it nil))
       (without-interrupts
         (unwind-protect
              (when (setq got-it (allow-with-interrupts
@@ -164,8 +203,8 @@ provided the default value is used for the mutex."
 
   (defun call-with-recursive-lock (function mutex)
     (declare (function function))
-    (let ((inner-lock-p (eq (mutex-value mutex) *current-thread*))
-          (got-it nil))
+    (dx-let ((inner-lock-p (eq (mutex-value mutex) *current-thread*))
+             (got-it nil))
       (without-interrupts
         (unwind-protect
              (when (or inner-lock-p (setf got-it (allow-with-interrupts
@@ -174,20 +213,11 @@ provided the default value is used for the mutex."
           (when got-it
             (release-mutex mutex))))))
 
-  (defun call-with-spinlock (function spinlock)
-    (declare (function function))
-    (let ((got-it nil))
-      (without-interrupts
-        (unwind-protect
-             (when (setf got-it (allow-with-interrupts
-                                 (get-spinlock spinlock)))
-               (with-local-interrupts (funcall function)))
-          (when got-it
-            (release-spinlock spinlock))))))
+
 
   (defun call-with-recursive-spinlock (function spinlock)
     (declare (function function))
-    (let ((inner-lock-p (eq (spinlock-value spinlock) *current-thread*))
+    (dx-let ((inner-lock-p (eq (spinlock-value spinlock) *current-thread*))
           (got-it nil))
       (without-interrupts
         (unwind-protect