X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fthreads.impure.lisp;h=3eb0fe0a74c8fea0578f3b0fd54216dae8339e4c;hb=1f03c7f326823245708a84af86b31ac72bdb1742;hp=aeb807efaf3cd0234ef523140d421684d6789f8e;hpb=cf507f95509a855a752b6f1771aa06877b8a3b30;p=sbcl.git

diff --git a/tests/threads.impure.lisp b/tests/threads.impure.lisp
index aeb807e..3eb0fe0 100644
--- a/tests/threads.impure.lisp
+++ b/tests/threads.impure.lisp
@@ -456,7 +456,8 @@
 
 (format t "~&interrupt test done~%")
 
-(defparameter *interrupt-count* 0)
+(defstruct counter (n 0 :type sb-vm:word))
+(defvar *interrupt-counter* (make-counter))
 
 (declaim (notinline check-interrupt-count))
 (defun check-interrupt-count (i)
@@ -471,16 +472,16 @@
                                       (princ cond)
                                       (sb-debug:backtrace
                                        most-positive-fixnum))))
-              (loop (check-interrupt-count *interrupt-count*)))))))
+              (loop (check-interrupt-count (counter-n *interrupt-counter*))))))))
   (let ((func (lambda ()
                 (princ ".")
                 (force-output)
-                (sb-impl::atomic-incf/symbol *interrupt-count*))))
-    (setq *interrupt-count* 0)
+                (sb-ext:atomic-incf (counter-n *interrupt-counter*)))))
+    (setf (counter-n *interrupt-counter*) 0)
     (dotimes (i 100)
       (sleep (random 0.1d0))
       (interrupt-thread c func))
-    (loop until (= *interrupt-count* 100) do (sleep 0.1))
+    (loop until (= (counter-n *interrupt-counter*) 100) do (sleep 0.1))
     (terminate-thread c)
     (wait-for-threads (list c))))
 
@@ -873,6 +874,9 @@
 |     (mp:make-process #'roomy)))
 |#
 
+;;; KLUDGE: No deadlines while waiting on lutex-based condition variables. This test
+;;; would just hang.
+#-sb-lutex
 (with-test (:name (:condition-variable :wait-multiple))
   (loop repeat 40 do
         (let ((waitqueue (sb-thread:make-waitqueue :name "Q"))