X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fthreads.impure.lisp;h=788862bd83870c1f533166c8fea4e4f84195baf0;hb=b14a61c6af3e3005c94e633e727177346240066e;hp=3800bbc37d1f4561312910b92b54eed98f630e9d;hpb=78c2361d1d9e680230df412f4d1489725781c6d2;p=sbcl.git

diff --git a/tests/threads.impure.lisp b/tests/threads.impure.lisp
index 3800bbc..788862b 100644
--- a/tests/threads.impure.lisp
+++ b/tests/threads.impure.lisp
@@ -11,36 +11,146 @@
 ;;;; absoluely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
 
-(in-package "SB-THREAD") ; this is white-box testing, really
+; WHITE-BOX TESTS
 
+(in-package "SB-THREAD")
 (use-package :test-util)
 (use-package "ASSERTOID")
 
+(setf sb-unix::*on-dangerous-wait* :error)
+
 (defun wait-for-threads (threads)
   (mapc (lambda (thread) (sb-thread:join-thread thread :default nil)) threads)
   (assert (not (some #'sb-thread:thread-alive-p threads))))
 
-(assert (eql 1 (length (list-all-threads))))
-
-(assert (eq *current-thread*
-            (find (thread-name *current-thread*) (list-all-threads)
-                  :key #'thread-name :test #'equal)))
-
-(assert (thread-alive-p *current-thread*))
-
-(let ((a 0))
-  (interrupt-thread *current-thread* (lambda () (setq a 1)))
-  (assert (eql a 1)))
-
-(let ((spinlock (make-spinlock)))
-  (with-spinlock (spinlock)))
-
-(let ((mutex (make-mutex)))
-  (with-mutex (mutex)
-    mutex))
-
-#-sb-thread (sb-ext:quit :unix-status 104)
-
+(with-test (:name (:threads :trivia))
+  (assert (eql 1 (length (list-all-threads))))
+
+  (assert (eq *current-thread*
+              (find (thread-name *current-thread*) (list-all-threads)
+                    :key #'thread-name :test #'equal)))
+
+  (assert (thread-alive-p *current-thread*)))
+
+(with-test (:name (:with-mutex :basics))
+  (let ((mutex (make-mutex)))
+    (with-mutex (mutex)
+      mutex)))
+
+(sb-alien:define-alien-routine "check_deferrables_blocked_or_lose"
+    void
+  (where sb-alien:unsigned-long))
+(sb-alien:define-alien-routine "check_deferrables_unblocked_or_lose"
+    void
+  (where sb-alien:unsigned-long))
+
+(with-test (:name (:interrupt-thread :basics :no-unwinding))
+  (let ((a 0))
+    (interrupt-thread *current-thread* (lambda () (setq a 1)))
+    (assert (eql a 1))))
+
+(with-test (:name (:interrupt-thread :deferrables-blocked))
+  (sb-thread:interrupt-thread sb-thread:*current-thread*
+                              (lambda ()
+                                (check-deferrables-blocked-or-lose 0))))
+
+(with-test (:name (:interrupt-thread :deferrables-unblocked))
+  (sb-thread:interrupt-thread sb-thread:*current-thread*
+                              (lambda ()
+                                (with-interrupts
+                                  (check-deferrables-unblocked-or-lose 0)))))
+
+(with-test (:name (:interrupt-thread :nlx))
+  (catch 'xxx
+    (sb-thread:interrupt-thread sb-thread:*current-thread*
+                                (lambda ()
+                                  (check-deferrables-blocked-or-lose 0)
+                                  (throw 'xxx nil))))
+  (check-deferrables-unblocked-or-lose 0))
+
+#-sb-thread (sb-ext:exit :code 104)
+
+;;;; Now the real tests...
+
+(with-test (:name (:with-mutex :timeout))
+  (let ((m (make-mutex)))
+    (with-mutex (m)
+      (assert (null (join-thread (make-thread
+                                  (lambda ()
+                                    (with-mutex (m :timeout 0.1)
+                                      t)))))))
+    (assert (join-thread (make-thread
+                          (lambda ()
+                            (with-mutex (m :timeout 0.1)
+                              t)))))))
+
+(with-test (:name (:interrupt-thread :deferrables-unblocked-by-lock))
+  (let ((lock (sb-thread::make-mutex))
+        (thread (make-join-thread (lambda ()
+                                    (loop (sleep 1))))))
+    (sb-thread::grab-mutex lock)
+    (sb-thread:interrupt-thread thread
+                                (lambda ()
+                                  (check-deferrables-blocked-or-lose 0)
+                                  (sb-thread::grab-mutex lock)
+                                  (check-deferrables-unblocked-or-lose 0)
+                                  (sb-thread:abort-thread)))
+    (sleep 3)
+    (sb-thread::release-mutex lock)))
+
+;;; compare-and-swap
+
+(defmacro defincf (name accessor &rest args)
+  `(defun ,name (x)
+     (let* ((old (,accessor x ,@args))
+         (new (1+ old)))
+    (loop until (eq old (sb-ext:compare-and-swap (,accessor x ,@args) old new))
+       do (setf old (,accessor x ,@args)
+                new (1+ old)))
+    new)))
+
+(defstruct cas-struct (slot 0))
+
+(defincf incf-car car)
+(defincf incf-cdr cdr)
+(defincf incf-slot cas-struct-slot)
+(defincf incf-symbol-value symbol-value)
+(defincf incf-svref/1 svref 1)
+(defincf incf-svref/0 svref 0)
+
+(defmacro def-test-cas (name init incf op)
+  `(with-test (:name ,name)
+     (flet ((,name (n)
+              (declare (fixnum n))
+              (let* ((x ,init)
+                     (run nil)
+                     (threads
+                      (loop repeat 10
+                            collect (sb-thread:make-thread
+                                     (lambda ()
+                                       (loop until run
+                                             do (sb-thread:thread-yield))
+                                       (loop repeat n do (,incf x)))))))
+                (setf run t)
+                (dolist (th threads)
+                  (sb-thread:join-thread th))
+                (assert (= (,op x) (* 10 n))))))
+       (,name 200000))))
+
+(def-test-cas test-cas-car (cons 0 nil) incf-car car)
+(def-test-cas test-cas-cdr (cons nil 0) incf-cdr cdr)
+(def-test-cas test-cas-slot (make-cas-struct) incf-slot cas-struct-slot)
+(def-test-cas test-cas-value (let ((x '.x.))
+                               (set x 0)
+                               x)
+  incf-symbol-value symbol-value)
+(def-test-cas test-cas-svref/0 (vector 0 nil) incf-svref/0 (lambda (x)
+                                                             (svref x 0)))
+(def-test-cas test-cas-svref/1 (vector nil 0) incf-svref/1 (lambda (x)
+                                                             (svref x 1)))
+(format t "~&compare-and-swap tests done~%")
+
+(with-test (:name (:threads :more-trivia)))
 (let ((old-threads (list-all-threads))
       (thread (make-thread (lambda ()
                              (assert (find *current-thread* *all-threads*))
@@ -52,15 +162,16 @@
   (sleep 3)
   (assert (not (thread-alive-p thread))))
 
-(with-test (:name '(:join-thread :nlx :default))
+(with-test (:name (:join-thread :nlx :default))
   (let ((sym (gensym)))
-    (assert (eq sym (join-thread (make-thread (lambda () (sb-ext:quit)))
+    (assert (eq sym (join-thread (make-thread (lambda () (sb-thread:abort-thread)))
                                  :default sym)))))
 
-(with-test (:name '(:join-thread :nlx :error))
-  (raises-error? (join-thread (make-thread (lambda () (sb-ext:quit))))))
+(with-test (:name (:join-thread :nlx :error))
+  (raises-error? (join-thread (make-thread (lambda () (sb-thread:abort-thread))))
+                 join-thread-error))
 
-(with-test (:name '(:join-thread :multiple-values))
+(with-test (:name (:join-thread :multiple-values))
   (assert (equal '(1 2 3)
                  (multiple-value-list
                   (join-thread (make-thread (lambda () (values 1 2 3))))))))
@@ -73,10 +184,10 @@
         (mutex (sb-thread:make-mutex)))
     ;; Start NTHREADS idle threads.
     (dotimes (i nthreads)
-      (sb-thread:make-thread (lambda ()
-                               (with-mutex (mutex)
-                                 (sb-thread:condition-wait queue mutex))
-                               (sb-ext:quit))))
+      (make-join-thread (lambda ()
+                          (with-mutex (mutex)
+                            (sb-thread:condition-wait queue mutex))
+                          (sb-thread:abort-thread))))
     (let ((start-time (get-internal-run-time)))
       (funcall function)
       (prog1 (- (get-internal-run-time) start-time)
@@ -84,125 +195,222 @@
 (defun fact (n)
   "A function that does work with the CPU."
   (if (zerop n) 1 (* n (fact (1- n)))))
-(let ((work (lambda () (fact 15000))))
-  (let ((zero (scaling-test work 0))
-        (four (scaling-test work 4)))
-    ;; a slightly weak assertion, but good enough for starters.
-    (assert (< four (* 1.5 zero)))))
+
+(with-test (:name :lurking-threads)
+  (let ((work (lambda () (fact 15000))))
+    (let ((zero (scaling-test work 0))
+          (four (scaling-test work 4)))
+      ;; a slightly weak assertion, but good enough for starters.
+      (assert (< four (* 1.5 zero))))))
 
 ;;; For one of the interupt-thread tests, we want a foreign function
 ;;; that does not make syscalls
 
-(with-open-file (o "threads-foreign.c" :direction :output :if-exists :supersede)
-  (format o "void loop_forever() { while(1) ; }~%"))
-(sb-ext:run-program
- #-sunos "cc" #+sunos "gcc"
- (or #+(or linux freebsd sunos) '(#+x86-64 "-fPIC"
-                                  "-shared" "-o" "threads-foreign.so" "threads-foreign.c")
-     #+darwin '("-dynamiclib" "-o" "threads-foreign.so" "threads-foreign.c")
-     (error "Missing shared library compilation options for this platform"))
- :search t)
-(sb-alien:load-shared-object "threads-foreign.so")
-(sb-alien:define-alien-routine loop-forever sb-alien:void)
-
+#-win32
+(progn
+  (with-open-file (o "threads-foreign.c" :direction :output :if-exists :supersede)
+    (format o "void loop_forever() { while(1) ; }~%"))
+  (sb-ext:run-program "/bin/sh"
+                      '("run-compiler.sh" "-sbcl-pic" "-sbcl-shared"
+                        "-o" "threads-foreign.so" "threads-foreign.c"))
+  (sb-alien:load-shared-object (truename "threads-foreign.so"))
+  (sb-alien:define-alien-routine loop-forever sb-alien:void)
+  (delete-file "threads-foreign.c"))
 
 ;;; elementary "can we get a lock and release it again"
-(let ((l (make-mutex :name "foo"))
-      (p *current-thread*))
-  (assert (eql (mutex-value l) nil) nil "1")
-  (sb-thread:get-mutex l)
-  (assert (eql (mutex-value l) p) nil "3")
-  (sb-thread:release-mutex l)
-  (assert (eql (mutex-value l) nil) nil "5"))
-
-(labels ((ours-p (value)
-           (eq *current-thread* value)))
-  (let ((l (make-mutex :name "rec")))
+(with-test (:name (:mutex :basics))
+  (let ((l (make-mutex :name "foo"))
+        (p *current-thread*))
     (assert (eql (mutex-value l) nil) nil "1")
-    (sb-thread:with-recursive-lock (l)
-      (assert (ours-p (mutex-value l)) nil "3")
+    (sb-thread:grab-mutex l)
+    (assert (eql (mutex-value l) p) nil "3")
+    (sb-thread:release-mutex l)
+    (assert (eql (mutex-value l) nil) nil "5")))
+
+(with-test (:name (:with-recursive-lock :basics))
+  (labels ((ours-p (value)
+             (eq *current-thread* value)))
+    (let ((l (make-mutex :name "rec")))
+      (assert (eql (mutex-value l) nil) nil "1")
       (sb-thread:with-recursive-lock (l)
-        (assert (ours-p (mutex-value l)) nil "4"))
-      (assert (ours-p (mutex-value l)) nil "5"))
-    (assert (eql (mutex-value l) nil) nil "6")))
+        (assert (ours-p (mutex-value l)) nil "3")
+        (sb-thread:with-recursive-lock (l)
+          (assert (ours-p (mutex-value l)) nil "4"))
+        (assert (ours-p (mutex-value l)) nil "5"))
+      (assert (eql (mutex-value l) nil) nil "6"))))
+
+(with-test (:name (:with-recursive-lock :wait-p))
+  (let ((m (make-mutex)))
+    (with-mutex (m)
+      (assert (null (join-thread (make-thread
+                                  (lambda ()
+                                    (with-recursive-lock (m :wait-p nil)
+                                      t)))))))
+    (assert (join-thread (make-thread
+                          (lambda ()
+                            (with-recursive-lock (m :wait-p nil)
+                              t)))))))
+
+(with-test (:name (:with-recursive-lock :wait-p :recursive))
+  (let ((m (make-mutex)))
+    (assert (join-thread (make-thread
+                          (lambda ()
+                            (with-recursive-lock (m :wait-p nil)
+                              (with-recursive-lock (m :wait-p nil)
+                                t))))))))
+
+(with-test (:name (:with-recursive-lock :timeout))
+  (let ((m (make-mutex)))
+    (with-mutex (m)
+      (assert (null (join-thread (make-thread
+                                  (lambda ()
+                                    (with-recursive-lock (m :timeout 0.1)
+                                      t)))))))
+    (assert (join-thread (make-thread
+                          (lambda ()
+                            (with-recursive-lock (m :timeout 0.1)
+                              t)))))))
+
+(with-test (:name (:with-recursive-lock :timeout :recursive))
+  (let ((m (make-mutex)))
+    (assert (join-thread (make-thread
+                          (lambda ()
+                            (with-recursive-lock (m :timeout 0.1)
+                              (with-recursive-lock (m :timeout 0.1)
+                                t))))))))
 
 (with-test (:name (:mutex :nesting-mutex-and-recursive-lock))
   (let ((l (make-mutex :name "a mutex")))
     (with-mutex (l)
       (with-recursive-lock (l)))))
 
-(let ((l (make-spinlock :name "spinlock")))
-  (assert (eql (spinlock-value l) 0) nil "1")
-  (with-spinlock (l)
-    (assert (eql (spinlock-value l) 1) nil "2"))
-  (assert (eql (spinlock-value l) 0) nil "3"))
-
 ;; test that SLEEP actually sleeps for at least the given time, even
 ;; if interrupted by another thread exiting/a gc/anything
-(let ((start-time (get-universal-time)))
-  (make-thread (lambda () (sleep 1) (sb-ext:gc :full t)))
-  (sleep 5)
-  (assert (>= (get-universal-time) (+ 5 start-time))))
-
-
-(let ((queue (make-waitqueue :name "queue"))
-      (lock (make-mutex :name "lock"))
-      (n 0))
-  (labels ((in-new-thread ()
-             (with-mutex (lock)
-               (assert (eql (mutex-value lock) *current-thread*))
-               (format t "~A got mutex~%" *current-thread*)
-               ;; now drop it and sleep
-               (condition-wait queue lock)
-               ;; after waking we should have the lock again
-               (assert (eql (mutex-value lock) *current-thread*))
-               (assert (eql n 1))
-               (decf n))))
-    (make-thread #'in-new-thread)
-    (sleep 2)                           ; give it  a chance to start
-    ;; check the lock is free while it's asleep
-    (format t "parent thread ~A~%" *current-thread*)
-    (assert (eql (mutex-value lock) nil))
-    (with-mutex (lock)
-      (incf n)
-      (condition-notify queue))
-    (sleep 1)))
-
-(let ((queue (make-waitqueue :name "queue"))
-      (lock (make-mutex :name "lock")))
-  (labels ((ours-p (value)
-             (eq *current-thread* value))
-           (in-new-thread ()
-             (with-recursive-lock (lock)
-               (assert (ours-p (mutex-value lock)))
-               (format t "~A got mutex~%" (mutex-value lock))
-               ;; now drop it and sleep
-               (condition-wait queue lock)
-               ;; after waking we should have the lock again
-               (format t "woken, ~A got mutex~%" (mutex-value lock))
-               (assert (ours-p (mutex-value lock))))))
-    (make-thread #'in-new-thread)
-    (sleep 2)                           ; give it  a chance to start
-    ;; check the lock is free while it's asleep
-    (format t "parent thread ~A~%" *current-thread*)
-    (assert (eql (mutex-value lock) nil))
-    (with-recursive-lock (lock)
-      (condition-notify queue))
-    (sleep 1)))
-
-(let ((mutex (make-mutex :name "contended")))
-  (labels ((run ()
-             (let ((me *current-thread*))
-               (dotimes (i 100)
-                 (with-mutex (mutex)
-                   (sleep .03)
-                   (assert (eql (mutex-value mutex) me)))
-                 (assert (not (eql (mutex-value mutex) me))))
-               (format t "done ~A~%" *current-thread*))))
-    (let ((kid1 (make-thread #'run))
-          (kid2 (make-thread #'run)))
-      (format t "contention ~A ~A~%" kid1 kid2)
-      (wait-for-threads (list kid1 kid2)))))
+(with-test (:name (:sleep :continue-sleeping-after-interrupt))
+  (let ((start-time (get-universal-time)))
+    (make-join-thread (lambda () (sleep 1) (sb-ext:gc :full t)))
+    (sleep 5)
+    (assert (>= (get-universal-time) (+ 5 start-time)))))
+
+
+(with-test (:name (:condition-wait :basics-1))
+  (let ((queue (make-waitqueue :name "queue"))
+        (lock (make-mutex :name "lock"))
+        (n 0))
+    (labels ((in-new-thread ()
+               (with-mutex (lock)
+                 (assert (eql (mutex-value lock) *current-thread*))
+                 (format t "~A got mutex~%" *current-thread*)
+                 ;; now drop it and sleep
+                 (condition-wait queue lock)
+                 ;; after waking we should have the lock again
+                 (assert (eql (mutex-value lock) *current-thread*))
+                 (assert (eql n 1))
+                 (decf n))))
+      (make-join-thread #'in-new-thread)
+      (sleep 2)            ; give it  a chance to start
+      ;; check the lock is free while it's asleep
+      (format t "parent thread ~A~%" *current-thread*)
+      (assert (eql (mutex-value lock) nil))
+      (with-mutex (lock)
+        (incf n)
+        (condition-notify queue))
+      (sleep 1))))
+
+(with-test (:name (:condition-wait :basics-2))
+  (let ((queue (make-waitqueue :name "queue"))
+        (lock (make-mutex :name "lock")))
+    (labels ((ours-p (value)
+               (eq *current-thread* value))
+             (in-new-thread ()
+               (with-recursive-lock (lock)
+                 (assert (ours-p (mutex-value lock)))
+                 (format t "~A got mutex~%" (mutex-value lock))
+                 ;; now drop it and sleep
+                 (condition-wait queue lock)
+                 ;; after waking we should have the lock again
+                 (format t "woken, ~A got mutex~%" (mutex-value lock))
+                 (assert (ours-p (mutex-value lock))))))
+      (make-join-thread #'in-new-thread)
+      (sleep 2)            ; give it  a chance to start
+      ;; check the lock is free while it's asleep
+      (format t "parent thread ~A~%" *current-thread*)
+      (assert (eql (mutex-value lock) nil))
+      (with-recursive-lock (lock)
+        (condition-notify queue))
+      (sleep 1))))
+
+(with-test (:name (:mutex :contention))
+  (let ((mutex (make-mutex :name "contended")))
+    (labels ((run ()
+               (let ((me *current-thread*))
+                 (dotimes (i 100)
+                   (with-mutex (mutex)
+                     (sleep .03)
+                     (assert (eql (mutex-value mutex) me)))
+                   (assert (not (eql (mutex-value mutex) me))))
+                 (format t "done ~A~%" *current-thread*))))
+      (let ((kid1 (make-thread #'run))
+            (kid2 (make-thread #'run)))
+        (format t "contention ~A ~A~%" kid1 kid2)
+        (wait-for-threads (list kid1 kid2))))))
+
+;;; GRAB-MUTEX
+
+(with-test (:name (:grab-mutex :waitp nil))
+  (let ((m (make-mutex)))
+    (with-mutex (m)
+      (assert (null (join-thread (make-thread
+                                  #'(lambda ()
+                                      (grab-mutex m :waitp nil)))))))))
+
+(with-test (:name (:grab-mutex :timeout :acquisition-fail))
+  (let ((m (make-mutex))
+        (w (make-semaphore)))
+    (with-mutex (m)
+      (let ((th (make-thread
+                 #'(lambda ()
+                     (prog1
+                         (grab-mutex m :timeout 0.1)
+                       (signal-semaphore w))))))
+        ;; Wait for it to -- otherwise the detect the deadlock chain
+        ;; from JOIN-THREAD.
+        (wait-on-semaphore w)
+        (assert (null (join-thread th)))))))
+
+(with-test (:name (:grab-mutex :timeout :acquisition-success))
+  (let ((m (make-mutex))
+        (child))
+    (with-mutex (m)
+      (setq child (make-thread #'(lambda () (grab-mutex m :timeout 1.0))))
+      (sleep 0.2))
+    (assert (eq (join-thread child) 't))))
+
+(with-test (:name (:grab-mutex :timeout+deadline))
+  (let ((m (make-mutex))
+        (w (make-semaphore)))
+    (with-mutex (m)
+      (let ((th (make-thread #'(lambda ()
+                                 (sb-sys:with-deadline (:seconds 0.0)
+                                   (handler-case
+                                       (grab-mutex m :timeout 0.0)
+                                     (sb-sys:deadline-timeout ()
+                                       (signal-semaphore w)
+                                       :deadline)))))))
+        (wait-on-semaphore w)
+        (assert (eq (join-thread th) :deadline))))))
+
+(with-test (:name (:grab-mutex :waitp+deadline))
+  (let ((m (make-mutex)))
+    (with-mutex (m)
+      (assert (eq (join-thread
+                   (make-thread #'(lambda ()
+                                    (sb-sys:with-deadline (:seconds 0.0)
+                                      (handler-case
+                                          (grab-mutex m :waitp nil)
+                                        (sb-sys:deadline-timeout ()
+                                          :deadline))))))
+                  'nil)))))
 
 ;;; semaphores
 
@@ -224,28 +432,28 @@
 (with-test (:name (:semaphore :wait-then-signal))
   (let ((sem (make-semaphore))
         (signalled-p nil))
-    (make-thread (lambda ()
-                   (sleep 0.1)
-                   (setq signalled-p t)
-                   (signal-semaphore sem)))
+    (make-join-thread (lambda ()
+                        (sleep 0.1)
+                        (setq signalled-p t)
+                        (signal-semaphore sem)))
     (wait-on-semaphore sem)
     (assert signalled-p)))
 
 (with-test (:name (:semaphore :signal-then-wait))
   (let ((sem (make-semaphore))
         (signalled-p nil))
-    (make-thread (lambda ()
-                   (signal-semaphore sem)
-                   (setq signalled-p t)))
+    (make-join-thread (lambda ()
+                        (signal-semaphore sem)
+                        (setq signalled-p t)))
     (loop until signalled-p)
     (wait-on-semaphore sem)
     (assert signalled-p)))
 
-(with-test (:name (:semaphore :multiple-signals))
+(defun test-semaphore-multiple-signals (wait-on-semaphore)
   (let* ((sem (make-semaphore :count 5))
-         (threads (loop repeat 20
-                        collect (make-thread (lambda ()
-                                               (wait-on-semaphore sem))))))
+         (threads (loop repeat 20 collecting
+                        (make-join-thread (lambda ()
+                                            (funcall wait-on-semaphore sem))))))
     (flet ((count-live-threads ()
              (count-if #'thread-alive-p threads)))
       (sleep 0.5)
@@ -260,17 +468,80 @@
       (sleep 0.5)
       (assert (= 0 (count-live-threads))))))
 
+(with-test (:name (:semaphore :multiple-signals))
+  (test-semaphore-multiple-signals #'wait-on-semaphore))
+
+(with-test (:name (:try-semaphore :trivial-fail))
+  (assert (eq (try-semaphore (make-semaphore :count 0)) 'nil)))
+
+(with-test (:name (:try-semaphore :trivial-success))
+  (let ((sem (make-semaphore :count 1)))
+    (assert (try-semaphore sem))
+    (assert (zerop (semaphore-count sem)))))
+
+(with-test (:name (:try-semaphore :trivial-fail :n>1))
+  (assert (eq (try-semaphore (make-semaphore :count 1) 2) 'nil)))
+
+(with-test (:name (:try-semaphore :trivial-success :n>1))
+  (let ((sem (make-semaphore :count 10)))
+    (assert (try-semaphore sem 5))
+    (assert (try-semaphore sem 5))
+    (assert (zerop (semaphore-count sem)))))
+
+(with-test (:name (:try-semaphore :emulate-wait-on-semaphore))
+  (flet ((busy-wait-on-semaphore (sem)
+           (loop until (try-semaphore sem) do (sleep 0.001))))
+    (test-semaphore-multiple-signals #'busy-wait-on-semaphore)))
+
+;;; Here we test that interrupting TRY-SEMAPHORE does not leave a
+;;; semaphore in a bad state.
+(with-test (:name (:try-semaphore :interrupt-safe))
+  (flet ((make-threads (count fn)
+           (loop repeat count collect (make-thread fn)))
+         (kill-thread (thread)
+           (when (thread-alive-p thread)
+             (ignore-errors (terminate-thread thread))))
+         (count-live-threads (threads)
+           (count-if #'thread-alive-p threads)))
+    ;; WAITERS will already be waiting on the semaphore while
+    ;; threads-being-interrupted will perform TRY-SEMAPHORE on that
+    ;; semaphore, and MORE-WAITERS are new threads trying to wait on
+    ;; the semaphore during the interruption-fire.
+    (let* ((sem (make-semaphore :count 100))
+           (waiters (make-threads 20 #'(lambda ()
+                                         (wait-on-semaphore sem))))
+           (triers  (make-threads 40 #'(lambda ()
+                                         (sleep (random 0.01))
+                                         (try-semaphore sem (1+ (random 5))))))
+           (more-waiters
+            (loop repeat 10
+                  do (kill-thread (nth (random 40) triers))
+                  collect (make-thread #'(lambda () (wait-on-semaphore sem)))
+                  do (kill-thread (nth (random 40) triers)))))
+      (sleep 0.5)
+      ;; Now ensure that the waiting threads will all be waked up,
+      ;; i.e. that the semaphore is still working.
+      (loop repeat (+ (count-live-threads waiters)
+                      (count-live-threads more-waiters))
+            do (signal-semaphore sem))
+      (sleep 0.5)
+      (assert (zerop (count-live-threads triers)))
+      (assert (zerop (count-live-threads waiters)))
+      (assert (zerop (count-live-threads more-waiters))))))
+
+
+
 (format t "~&semaphore tests done~%")
 
 (defun test-interrupt (function-to-interrupt &optional quit-p)
-  (let ((child  (make-thread function-to-interrupt)))
+  (let ((child  (make-kill-thread function-to-interrupt)))
     ;;(format t "gdb ./src/runtime/sbcl ~A~%attach ~A~%" child child)
     (sleep 2)
     (format t "interrupting child ~A~%" child)
     (interrupt-thread child
                       (lambda ()
                         (format t "child pid ~A~%" *current-thread*)
-                        (when quit-p (sb-ext:quit))))
+                        (when quit-p (abort-thread))))
     (sleep 1)
     child))
 
@@ -278,36 +549,43 @@
 ;; (d) waiting on a lock, (e) some code which we hope is likely to be
 ;; in pseudo-atomic
 
-(let ((child (test-interrupt (lambda () (loop)))))  (terminate-thread child))
+(with-test (:name (:interrupt-thread :more-basics))
+  (let ((child (test-interrupt (lambda () (loop)))))
+    (terminate-thread child)))
 
-(test-interrupt #'loop-forever :quit)
+(with-test (:name (:interrupt-thread :interrupt-foreign-loop)
+                  ;; This feature is explicitly unsupported on Win32.
+                  :skipped-on :win32)
+  (test-interrupt #'loop-forever :quit))
 
-(let ((child (test-interrupt (lambda () (loop (sleep 2000))))))
-  (terminate-thread child)
-  (wait-for-threads (list child)))
+(with-test (:name (:interrupt-thread :interrupt-sleep))
+  (let ((child (test-interrupt (lambda () (loop (sleep 2000))))))
+    (terminate-thread child)
+    (wait-for-threads (list child))))
 
-(let ((lock (make-mutex :name "loctite"))
-      child)
-  (with-mutex (lock)
-    (setf child (test-interrupt
-                 (lambda ()
-                   (with-mutex (lock)
-                     (assert (eql (mutex-value lock) *current-thread*)))
-                   (assert (not (eql (mutex-value lock) *current-thread*)))
-                   (sleep 10))))
-    ;;hold onto lock for long enough that child can't get it immediately
-    (sleep 5)
-    (interrupt-thread child (lambda () (format t "l ~A~%" (mutex-value lock))))
-    (format t "parent releasing lock~%"))
-  (terminate-thread child)
-  (wait-for-threads (list child)))
+(with-test (:name (:interrupt-thread :interrupt-mutex-acquisition))
+  (let ((lock (make-mutex :name "loctite"))
+        child)
+    (with-mutex (lock)
+      (setf child (test-interrupt
+                   (lambda ()
+                     (with-mutex (lock)
+                       (assert (eql (mutex-value lock) *current-thread*)))
+                     (assert (not (eql (mutex-value lock) *current-thread*)))
+                     (sleep 10))))
+      ;;hold onto lock for long enough that child can't get it immediately
+      (sleep 5)
+      (interrupt-thread child (lambda () (format t "l ~A~%" (mutex-value lock))))
+      (format t "parent releasing lock~%"))
+    (terminate-thread child)
+    (wait-for-threads (list child))))
 
 (format t "~&locking test done~%")
 
 (defun alloc-stuff () (copy-list '(1 2 3 4 5)))
 
-(progn
-  (let ((thread (sb-thread:make-thread (lambda () (loop (alloc-stuff))))))
+(with-test (:name (:interrupt-thread :interrupt-consing-child))
+  (let ((thread (make-thread (lambda () (loop (alloc-stuff))))))
     (let ((killers
            (loop repeat 4 collect
                  (sb-thread:make-thread
@@ -324,23 +602,26 @@
 
 (format t "~&multi interrupt test done~%")
 
-(let ((c (make-thread (lambda () (loop (alloc-stuff))))))
-  ;; NB this only works on x86: other ports don't have a symbol for
-  ;; pseudo-atomic atomicity
-  (dotimes (i 100)
-    (sleep (random 0.1d0))
-    (interrupt-thread c
-                      (lambda ()
-                        (princ ".") (force-output)
-                        (assert (thread-alive-p *current-thread*))
-                        (assert
-                         (not (logbitp 0 SB-KERNEL:*PSEUDO-ATOMIC-BITS*))))))
-  (terminate-thread c)
-  (wait-for-threads (list c)))
+#+(or x86 x86-64) ;; x86oid-only, see internal commentary.
+(with-test (:name (:interrupt-thread :interrupt-consing-child :again))
+  (let ((c (make-thread (lambda () (loop (alloc-stuff))))))
+    ;; NB this only works on x86: other ports don't have a symbol for
+    ;; pseudo-atomic atomicity
+    (dotimes (i 100)
+      (sleep (random 0.1d0))
+      (interrupt-thread c
+                        (lambda ()
+                          (princ ".") (force-output)
+                          (assert (thread-alive-p *current-thread*))
+                          (assert
+                           (not (logbitp 0 SB-KERNEL:*PSEUDO-ATOMIC-BITS*))))))
+    (terminate-thread c)
+    (wait-for-threads (list c))))
 
 (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)
@@ -349,78 +630,119 @@
   (unless (typep i 'fixnum)
     (error "!!!!!!!!!!!")))
 
-(let ((c (make-thread
-          (lambda ()
-            (handler-bind ((error #'(lambda (cond)
-                                      (princ cond)
-                                      (sb-debug:backtrace
-                                       most-positive-fixnum))))
-              (loop (check-interrupt-count *interrupt-count*)))))))
-  (let ((func (lambda ()
-                (princ ".")
-                (force-output)
-                (sb-impl::atomic-incf/symbol *interrupt-count*))))
-    (setq *interrupt-count* 0)
-    (dotimes (i 100)
-      (sleep (random 0.1d0))
-      (interrupt-thread c func))
-    (loop until (= *interrupt-count* 100) do (sleep 0.1))
-    (terminate-thread c)
-    (wait-for-threads (list c))))
+(with-test (:name (:interrupt-thread :interrupt-ATOMIC-INCF))
+  (let ((c (make-thread
+            (lambda ()
+              (handler-bind ((error #'(lambda (cond)
+                                        (princ cond)
+                                        (sb-debug:backtrace
+                                         most-positive-fixnum))))
+                (loop (check-interrupt-count
+                       (counter-n *interrupt-counter*))))))))
+    (let ((func (lambda ()
+                  (princ ".")
+                  (force-output)
+                  (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 (= (counter-n *interrupt-counter*) 100) do (sleep 0.1))
+      (terminate-thread c)
+      (wait-for-threads (list c)))))
 
 (format t "~&interrupt count test done~%")
 
-(let (a-done b-done)
-  (make-thread (lambda ()
-                 (dotimes (i 100)
-                   (sb-ext:gc) (princ "\\") (force-output))
-                 (setf a-done t)))
-  (make-thread (lambda ()
-                 (dotimes (i 25)
-                   (sb-ext:gc :full t)
-                   (princ "/") (force-output))
-                 (setf b-done t)))
-  (loop
-   (when (and a-done b-done) (return))
-   (sleep 1)))
+(defvar *runningp* nil)
+
+(with-test (:name (:interrupt-thread :no-nesting))
+  (let ((thread (sb-thread:make-thread
+                 (lambda ()
+                   (catch 'xxx
+                     (loop))))))
+    (declare (special runningp))
+    (sleep 0.2)
+    (sb-thread:interrupt-thread thread
+                                (lambda ()
+                                    (let ((*runningp* t))
+                                      (sleep 1))))
+    (sleep 0.2)
+    (sb-thread:interrupt-thread thread
+                                (lambda ()
+                                  (throw 'xxx *runningp*)))
+    (assert (not (sb-thread:join-thread thread)))))
+
+(with-test (:name (:interrupt-thread :nesting))
+  (let ((thread (sb-thread:make-thread
+                 (lambda ()
+                   (catch 'xxx
+                     (loop))))))
+    (declare (special runningp))
+    (sleep 0.2)
+    (sb-thread:interrupt-thread thread
+                                (lambda ()
+                                  (let ((*runningp* t))
+                                    (sb-sys:with-interrupts
+                                      (sleep 1)))))
+    (sleep 0.2)
+    (sb-thread:interrupt-thread thread
+                                (lambda ()
+                                  (throw 'xxx *runningp*)))
+    (assert (sb-thread:join-thread thread))))
+
+(with-test (:name (:two-threads-running-gc))
+  (let (a-done b-done)
+    (make-join-thread (lambda ()
+                        (dotimes (i 100)
+                          (sb-ext:gc) (princ "\\") (force-output))
+                        (setf a-done t)))
+    (make-join-thread (lambda ()
+                        (dotimes (i 25)
+                          (sb-ext:gc :full t)
+                          (princ "/") (force-output))
+                        (setf b-done t)))
+    (loop
+      (when (and a-done b-done) (return))
+      (sleep 1))))
 
 (terpri)
 
 (defun waste (&optional (n 100000))
   (loop repeat n do (make-string 16384)))
 
-(loop for i below 100 do
-      (princ "!")
-      (force-output)
-      (sb-thread:make-thread
-       #'(lambda ()
-           (waste)))
-      (waste)
-      (sb-ext:gc))
+(with-test (:name (:one-thread-runs-gc-while-other-conses))
+  (loop for i below 100 do
+        (princ "!")
+        (force-output)
+        (make-join-thread
+         #'(lambda ()
+             (waste)))
+        (waste)
+        (sb-ext:gc)))
 
 (terpri)
 
 (defparameter *aaa* nil)
-(loop for i below 100 do
-      (princ "!")
-      (force-output)
-      (sb-thread:make-thread
-       #'(lambda ()
-           (let ((*aaa* (waste)))
-             (waste))))
-      (let ((*aaa* (waste)))
-        (waste))
-      (sb-ext:gc))
+(with-test (:name (:one-thread-runs-gc-while-other-conses :again))
+  (loop for i below 100 do
+        (princ "!")
+        (force-output)
+        (make-join-thread
+         #'(lambda ()
+             (let ((*aaa* (waste)))
+               (waste))))
+        (let ((*aaa* (waste)))
+          (waste))
+        (sb-ext:gc)))
 
 (format t "~&gc test done~%")
 
 ;; this used to deadlock on session-lock
-(sb-thread:make-thread (lambda () (sb-ext:gc)))
-;; expose thread creation races by exiting quickly
-(sb-thread:make-thread (lambda ()))
+(with-test (:name (:no-session-deadlock))
+  (make-join-thread (lambda () (sb-ext:gc))))
 
 (defun exercise-syscall (fn reference-errno)
-  (sb-thread:make-thread
+  (make-kill-thread
    (lambda ()
      (loop do
           (funcall fn)
@@ -432,69 +754,84 @@
                       (sb-unix::strerror)
                       reference-errno)
               (force-output)
-              (sb-ext:quit :unix-status 1)))))))
+              (abort-thread)))))))
 
 ;; (nanosleep -1 0) does not fail on FreeBSD
-(let* (#-freebsd
-       (nanosleep-errno (progn
-                          (sb-unix:nanosleep -1 0)
-                          (sb-unix::get-errno)))
-       (open-errno (progn
-                     (open "no-such-file"
-                           :if-does-not-exist nil)
-                     (sb-unix::get-errno)))
-       (threads
-        (list
-         #-freebsd
-         (exercise-syscall (lambda () (sb-unix:nanosleep -1 0)) nanosleep-errno)
-         (exercise-syscall (lambda () (open "no-such-file"
-                                            :if-does-not-exist nil))
-                           open-errno)
-         (sb-thread:make-thread (lambda () (loop (sb-ext:gc) (sleep 1)))))))
-  (sleep 10)
-  (princ "terminating threads")
-  (dolist (thread threads)
-    (sb-thread:terminate-thread thread)))
+(with-test (:name (:exercising-concurrent-syscalls) :fails-on :win32)
+  (let* (#-freebsd
+         (nanosleep-errno (progn
+                            (sb-unix:nanosleep -1 0)
+                            (sb-unix::get-errno)))
+         (open-errno (progn
+                       (open "no-such-file"
+                             :if-does-not-exist nil)
+                       (sb-unix::get-errno)))
+         (threads
+          (list
+           #-freebsd
+           (exercise-syscall (lambda () (sb-unix:nanosleep -1 0)) nanosleep-errno)
+           (exercise-syscall (lambda () (open "no-such-file"
+                                              :if-does-not-exist nil))
+                             open-errno)
+           (make-join-thread (lambda () (loop (sb-ext:gc) (sleep 1)))))))
+    (sleep 10)
+    (princ "terminating threads")
+    (dolist (thread threads)
+      (sb-thread:terminate-thread thread))))
 
 (format t "~&errno test done~%")
 
-(loop repeat 100 do
-      (let ((thread (sb-thread:make-thread (lambda () (sleep 0.1)))))
-        (sb-thread:interrupt-thread
-         thread
-         (lambda ()
-           (assert (find-restart 'sb-thread:terminate-thread))))))
+(with-test (:name :all-threads-have-abort-restart)
+  (loop repeat 100 do
+        (let ((thread (make-kill-thread (lambda () (sleep 0.1)))))
+          (sb-thread:interrupt-thread
+           thread
+           (lambda ()
+             (assert (find-restart 'abort)))))))
 
 (sb-ext:gc :full t)
 
 (format t "~&thread startup sigmask test done~%")
 
-(sb-debug::enable-debugger)
-(let* ((main-thread *current-thread*)
-       (interruptor-thread
-        (make-thread (lambda ()
-                       (sleep 2)
-                       (interrupt-thread main-thread #'break)
-                       (sleep 2)
-                       (interrupt-thread main-thread #'continue)))))
-  (with-session-lock (*session*)
-    (sleep 3))
-  (loop while (thread-alive-p interruptor-thread)))
+(with-test (:name (:debugger-no-hang-on-session-lock-if-interrupted)
+                  :fails-on :win32)
+  #+win32 (error "user would have to touch a key interactively to proceed")
+  (sb-debug::enable-debugger)
+  (let* ((main-thread *current-thread*)
+         (interruptor-thread
+          (make-thread (lambda ()
+                         (sleep 2)
+                         (interrupt-thread main-thread
+                                           (lambda ()
+                                             (with-interrupts
+                                               (break))))
+                         (sleep 2)
+                         (interrupt-thread main-thread #'continue))
+                       :name "interruptor")))
+    (with-session-lock (*session*)
+      (sleep 3))
+    (loop while (thread-alive-p interruptor-thread))))
 
 (format t "~&session lock test done~%")
 
-(loop repeat 20 do
-      (wait-for-threads
-       (loop for i below 100 collect
-             (sb-thread:make-thread (lambda ())))))
+;; expose thread creation races by exiting quickly
+(with-test (:name (:no-thread-creation-race :light))
+  (make-join-thread (lambda ())))
+
+(with-test (:name (:no-thread-creation-race :heavy))
+  (loop repeat 20 do
+        (wait-for-threads
+         (loop for i below 100 collect
+               (sb-thread:make-thread (lambda ()))))))
 
 (format t "~&creation test done~%")
 
 ;; interrupt handlers are per-thread with pthreads, make sure the
 ;; handler installed in one thread is global
-(sb-thread:make-thread
- (lambda ()
-   (sb-ext:run-program "sleep" '("1") :search t :wait nil)))
+(with-test (:name (:global-interrupt-handler))
+  (make-join-thread
+   (lambda ()
+     (sb-ext:run-program "sleep" '("1") :search t :wait nil))))
 
 ;;;; Binding stack safety
 
@@ -522,6 +859,7 @@
   (sb-ext:gc)
   (incf *n-gcs-done*))
 
+#+(or x86 x86-64) ;the only platforms with a *binding-stack-pointer* variable
 (defun exercise-binding ()
   (loop
    (let ((*x* (make-something-big)))
@@ -534,52 +872,182 @@
    ;; now SOMETHING is gc'ed and the binding stack looks like this: 0,
    ;; 0, SOMETHING, 0 (because the symbol slots are zeroed on
    ;; unbinding but values are not).
-   (let ((*x* nil))
+   (let ((*x* nil)
+         (binding-pointer-delta (ash 2 (- sb-vm:word-shift sb-vm:n-fixnum-tag-bits))))
      ;; bump bsp as if a BIND had just started
-     (incf sb-vm::*binding-stack-pointer* 2)
+     (incf sb-vm::*binding-stack-pointer* binding-pointer-delta)
      (wait-for-gc)
-     (decf sb-vm::*binding-stack-pointer* 2))))
+     (decf sb-vm::*binding-stack-pointer* binding-pointer-delta))))
 
+#+(or x86 x86-64) ;the only platforms with a *binding-stack-pointer* variable
 (with-test (:name (:binding-stack-gc-safety))
   (let (threads)
     (unwind-protect
          (progn
-           (push (sb-thread:make-thread #'exercise-binding) threads)
-           (push (sb-thread:make-thread (lambda ()
-                                          (loop
-                                           (sleep 0.1)
-                                           (send-gc))))
+           (push (make-kill-thread #'exercise-binding) threads)
+           (push (make-kill-thread (lambda ()
+                                     (loop
+                                      (sleep 0.1)
+                                      (send-gc))))
                  threads)
            (sleep 4))
       (mapc #'sb-thread:terminate-thread threads))))
 
 (format t "~&binding test done~%")
 
-;; Try to corrupt the NEXT-VECTOR. Operations on a hash table with a
-;; cyclic NEXT-VECTOR can loop endlessly in a WITHOUT-GCING form
-;; causing the next gc hang SBCL.
-(with-test (:name (:hash-table-thread-safety))
+;;; HASH TABLES
+
+(defvar *errors* nil)
+
+(defun oops (e)
+  (setf *errors* e)
+  (format t "~&oops: ~A in ~S~%" e *current-thread*)
+  (sb-debug:backtrace)
+  (catch 'done))
+
+(with-test (:name (:unsynchronized-hash-table)
+                  ;; FIXME: This test occasionally eats out craploads
+                  ;; of heap instead of expected error early. Not 100%
+                  ;; sure if it would finish as expected, but since it
+                  ;; hits swap on my system I'm not likely to find out
+                  ;; soon. Disabling for now. -- nikodemus
+            :skipped-on :sbcl)
+  ;; We expect a (probable) error here: parellel readers and writers
+  ;; on a hash-table are not expected to work -- but we also don't
+  ;; expect this to corrupt the image.
   (let* ((hash (make-hash-table))
-         (threads (list (sb-thread:make-thread
+         (*errors* nil)
+         (threads (list (make-kill-thread
                          (lambda ()
-                           (loop
-                            ;;(princ "1") (force-output)
-                            (setf (gethash (random 100) hash) 'h))))
-                        (sb-thread:make-thread
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 ;;(princ "1") (force-output)
+                                 (setf (gethash (random 100) hash) 'h)))))
+                         :name "writer")
+                        (make-kill-thread
                          (lambda ()
-                           (loop
-                            ;;(princ "2") (force-output)
-                            (remhash (random 100) hash))))
-                        (sb-thread:make-thread
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 ;;(princ "2") (force-output)
+                                 (remhash (random 100) hash)))))
+                         :name "reader")
+                        (make-kill-thread
                          (lambda ()
-                           (loop
-                            (sleep (random 1.0))
-                            (sb-ext:gc :full t)))))))
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 (sleep (random 1.0))
+                                 (sb-ext:gc :full t)))))
+                         :name "collector"))))
     (unwind-protect
-         (sleep 5)
+         (sleep 10)
       (mapc #'sb-thread:terminate-thread threads))))
 
-(format t "~&hash table test done~%")
+(format t "~&unsynchronized hash table test done~%")
+
+(with-test (:name (:synchronized-hash-table))
+  (let* ((hash (make-hash-table :synchronized t))
+         (*errors* nil)
+         (threads (list (make-join-thread
+                         (lambda ()
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 ;;(princ "1") (force-output)
+                                 (setf (gethash (random 100) hash) 'h)))))
+                         :name "writer")
+                        (make-join-thread
+                         (lambda ()
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 ;;(princ "2") (force-output)
+                                 (remhash (random 100) hash)))))
+                         :name "reader")
+                        (make-join-thread
+                         (lambda ()
+                           (catch 'done
+                             (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 (sleep (random 1.0))
+                                 (sb-ext:gc :full t)))))
+                         :name "collector"))))
+    (unwind-protect
+         (sleep 10)
+      (mapc #'sb-thread:terminate-thread threads))
+    (assert (not *errors*))))
+
+(format t "~&synchronized hash table test done~%")
+
+(with-test (:name (:hash-table-parallel-readers))
+  (let ((hash (make-hash-table))
+        (*errors* nil))
+    (loop repeat 50
+          do (setf (gethash (random 100) hash) 'xxx))
+    (let ((threads (list (make-kill-thread
+                          (lambda ()
+                            (catch 'done
+                              (handler-bind ((serious-condition 'oops))
+                                (loop
+                                      until (eq t (gethash (random 100) hash))))))
+                          :name "reader 1")
+                         (make-kill-thread
+                          (lambda ()
+                            (catch 'done
+                              (handler-bind ((serious-condition 'oops))
+                                (loop
+                                      until (eq t (gethash (random 100) hash))))))
+                          :name "reader 2")
+                         (make-kill-thread
+                          (lambda ()
+                            (catch 'done
+                              (handler-bind ((serious-condition 'oops))
+                                (loop
+                                      until (eq t (gethash (random 100) hash))))))
+                          :name "reader 3")
+                         (make-kill-thread
+                          (lambda ()
+                            (catch 'done
+                              (handler-bind ((serious-condition 'oops))
+                               (loop
+                                 (sleep (random 1.0))
+                                 (sb-ext:gc :full t)))))
+                          :name "collector"))))
+      (unwind-protect
+           (sleep 10)
+        (mapc #'sb-thread:terminate-thread threads))
+      (assert (not *errors*)))))
+
+(format t "~&multiple reader hash table test done~%")
+
+(with-test (:name (:hash-table-single-accessor-parallel-gc))
+  (let ((hash (make-hash-table))
+        (*errors* nil))
+    (let ((threads (list (make-kill-thread
+                          (lambda ()
+                            (handler-bind ((serious-condition 'oops))
+                              (loop
+                                (let ((n (random 100)))
+                                  (if (gethash n hash)
+                                      (remhash n hash)
+                                      (setf (gethash n hash) 'h))))))
+                          :name "accessor")
+                         (make-kill-thread
+                          (lambda ()
+                            (handler-bind ((serious-condition 'oops))
+                              (loop
+                                (sleep (random 1.0))
+                                (sb-ext:gc :full t))))
+                          :name "collector"))))
+      (unwind-protect
+           (sleep 10)
+        (mapc #'sb-thread:terminate-thread threads))
+      (assert (not *errors*)))))
+
+(format t "~&single accessor hash table test~%")
+
 #|  ;; a cll post from eric marsden
 | (defun crash ()
 |   (setq *debugger-hook*
@@ -610,8 +1078,8 @@
                (let ((threads (loop for x from 1 to 10
                                     collect
                                     (let ((x x))
-                                      (sb-thread:make-thread (lambda ()
-                                                               (test x)))))))
+                                      (make-kill-thread (lambda ()
+                                                          (test x)))))))
                  (sleep 5)
                  (with-mutex (lock)
                    (funcall notify-fun queue))
@@ -630,6 +1098,100 @@
 
 (format t "waitqueue wakeup tests done~%")
 
+;;; Make sure that a deadline handler is not invoked twice in a row in
+;;; CONDITION-WAIT. See LP #512914 for a detailed explanation.
+;;;
+(with-test (:name (:condition-wait :deadlines :LP-512914))
+  (let ((n 2)                      ; was empirically enough to trigger the bug
+        (mutex (sb-thread:make-mutex))
+        (waitq (sb-thread:make-waitqueue))
+        (threads nil)
+        (deadline-handler-run-twice? nil))
+    (dotimes (i n)
+      (let ((child
+              (sb-thread:make-thread
+               #'(lambda ()
+                   (handler-bind
+                       ((sb-sys:deadline-timeout
+                          (let ((already? nil))
+                            #'(lambda (c)
+                                (when already?
+                                  (setq deadline-handler-run-twice? t))
+                                (setq already? t)
+                                (sleep 0.2)
+                                (sb-thread:condition-broadcast waitq)
+                                (sb-sys:defer-deadline 10.0 c)))))
+                     (sb-sys:with-deadline (:seconds 0.1)
+                       (sb-thread:with-mutex (mutex)
+                         (sb-thread:condition-wait waitq mutex))))))))
+        (push child threads)))
+    (mapc #'sb-thread:join-thread threads)
+    (assert (not deadline-handler-run-twice?))))
+
+(with-test (:name (:condition-wait :signal-deadline-with-interrupts-enabled))
+  (let ((mutex (sb-thread:make-mutex))
+        (waitq (sb-thread:make-waitqueue))
+        (A-holds? :unknown)
+        (B-holds? :unknown)
+        (A-interrupts-enabled? :unknown)
+        (B-interrupts-enabled? :unknown)
+        (A)
+        (B))
+    ;; W.L.O.G., we assume that A is executed first...
+    (setq A (sb-thread:make-thread
+             #'(lambda ()
+                 (handler-bind
+                     ((sb-sys:deadline-timeout
+                       #'(lambda (c)
+                           ;; We came here through the call to DECODE-TIMEOUT
+                           ;; in CONDITION-WAIT; hence both here are supposed
+                           ;; to evaluate to T.
+                           (setq A-holds? (sb-thread:holding-mutex-p mutex))
+                           (setq A-interrupts-enabled?
+                                 sb-sys:*interrupts-enabled*)
+                           (sleep 0.2)
+                           (sb-thread:condition-broadcast waitq)
+                           (sb-sys:defer-deadline 10.0 c))))
+                   (sb-sys:with-deadline (:seconds 0.1)
+                     (sb-thread:with-mutex (mutex)
+                       (sb-thread:condition-wait waitq mutex)))))
+             :name "A"))
+    (setq B (sb-thread:make-thread
+             #'(lambda ()
+                 (thread-yield)
+                 (handler-bind
+                     ((sb-sys:deadline-timeout
+                       #'(lambda (c)
+                           ;; We came here through the call to DECODE-TIMEOUT
+                           ;; in CONDITION-WAIT (contended case of
+                           ;; reaquiring the mutex) - so the former will
+                           ;; be NIL, but interrupts should still be enabled.
+                           (setq B-holds? (sb-thread:holding-mutex-p mutex))
+                           (setq B-interrupts-enabled?
+                                 sb-sys:*interrupts-enabled*)
+                           (sleep 0.2)
+                           (sb-thread:condition-broadcast waitq)
+                           (sb-sys:defer-deadline 10.0 c))))
+                   (sb-sys:with-deadline (:seconds 0.1)
+                     (sb-thread:with-mutex (mutex)
+                       (sb-thread:condition-wait waitq mutex)))))
+             :name "B"))
+    (sb-thread:join-thread A)
+    (sb-thread:join-thread B)
+    (let ((A-result (list A-holds? A-interrupts-enabled?))
+          (B-result (list B-holds? B-interrupts-enabled?)))
+      ;; We also check some subtle behaviour w.r.t. whether a deadline
+      ;; handler in CONDITION-WAIT got the mutex, or not. This is most
+      ;; probably very internal behaviour (so user should not depend
+      ;; on it) -- I added the testing here just to manifest current
+      ;; behaviour.
+      (cond ((equal A-result '(t t)) (assert (equal B-result '(nil t))))
+            ((equal B-result '(t t)) (assert (equal A-result '(nil t))))
+            (t
+             (error "Failure: fell through wit A: ~S, B: ~S"
+                    A-result
+                    B-result))))))
+
 (with-test (:name (:mutex :finalization))
   (let ((a nil))
     (dotimes (i 500000)
@@ -664,13 +1226,13 @@
                                        (unless (zerop n)
                                          (setf ok nil)
                                          (format t "N != 0 (~A)~%" n)
-                                         (sb-ext:quit)))))))))
+                                         (abort-thread)))))))))
     (wait-for-threads threads)
     (assert ok)))
 
 (format t "infodb test done~%")
 
-(with-test (:name (:backtrace))
+(with-test (:name :backtrace)
   ;; Printing backtraces from several threads at once used to hang the
   ;; whole SBCL process (discovered by accident due to a timer.impure
   ;; test misbehaving). The cause was that packages weren't even
@@ -689,7 +1251,7 @@
 
 (format t "~&starting gc deadlock test: WARNING: THIS TEST WILL HANG ON FAILURE!~%")
 
-(with-test (:name (:gc-deadlock))
+(with-test (:name :gc-deadlock)
   ;; Prior to 0.9.16.46 thread exit potentially deadlocked the
   ;; GC due to *all-threads-lock* and session lock. On earlier
   ;; versions and at least on one specific box this test is good enough
@@ -705,20 +1267,20 @@
          (force-output))
        (handler-case
            (if (oddp i)
-               (sb-thread:make-thread
+               (make-join-thread
                 (lambda ()
                   (sleep (random 0.001)))
-                :name (list :sleep i))
-               (sb-thread:make-thread
+                :name (format nil "SLEEP-~D" i))
+               (make-join-thread
                 (lambda ()
                   ;; KLUDGE: what we are doing here is explicit,
                   ;; but the same can happen because of a regular
                   ;; MAKE-THREAD or LIST-ALL-THREADS, and various
                   ;; session functions.
-                  (sb-thread:with-mutex (sb-thread::*all-threads-lock*)
+                  (sb-thread::with-all-threads-lock
                     (sb-thread::with-session-lock (sb-thread::*session*)
                       (sb-ext:gc))))
-                :name (list :gc i)))
+                :name (format nil "GC-~D" i)))
          (error (e)
            (format t "~%error creating thread ~D: ~A -- backing off for retry~%" i e)
            (sleep 0.1)
@@ -750,7 +1312,14 @@
           two (make-box)
           three (make-box))))
 
-(with-test (:name (:funcallable-instances))
+;;; PowerPC safepoint builds occasionally hang or busy-loop (or
+;;; sometimes run out of memory) in the following test.  For developers
+;;; interested in debugging this combination of features, it might be
+;;; fruitful to concentrate their efforts around this test...
+
+(with-test (:name (:funcallable-instances)
+                  :skipped-on '(and :sb-safepoint
+                                    (not :c-stack-is-control-stack)))
   ;; the funcallable-instance implementation used not to be threadsafe
   ;; against setting the funcallable-instance function to a closure
   ;; (because the code and lexenv were set separately).
@@ -796,8 +1365,222 @@
   (format t "ok~%")
   (force-output))
 
-(with-test (:name '(:hash-cache :subtypep))
-  (dotimes (i 10)
-    (sb-thread:make-thread #'subtypep-hash-cache-test)))
-
+(with-test (:name (:hash-cache :subtypep))
+  (mapc #'join-thread
+        (loop repeat 10
+              collect (sb-thread:make-thread #'subtypep-hash-cache-test))))
 (format t "hash-cache tests done~%")
+
+;;;; BLACK BOX TESTS
+
+(in-package :cl-user)
+(use-package :test-util)
+(use-package "ASSERTOID")
+
+(format t "parallel defclass test -- WARNING, WILL HANG ON FAILURE!~%")
+(with-test (:name :parallel-defclass)
+  (defclass test-1 () ((a :initform :orig-a)))
+  (defclass test-2 () ((b :initform :orig-b)))
+  (defclass test-3 (test-1 test-2) ((c :initform :orig-c)))
+  ;; This test is more likely to pass on Windows with the FORCE-OUTPUT
+  ;; calls disabled in the folloving code.  (As seen on a Server 2012
+  ;; installation.)  Clearly, this sort of workaround in a test is
+  ;; cheating, and might be hiding the underlying bug that the test is
+  ;; exposing.  Let's review this later.
+  (let* ((run t)
+         (d1 (sb-thread:make-thread (lambda ()
+                                      (loop while run
+                                            do (defclass test-1 () ((a :initform :new-a)))
+                                            (write-char #\1)
+                                            #-win32 (force-output)))
+                                    :name "d1"))
+         (d2 (sb-thread:make-thread (lambda ()
+                                      (loop while run
+                                            do (defclass test-2 () ((b :initform :new-b)))
+                                               (write-char #\2)
+                                               #-win32 (force-output)))
+                                    :name "d2"))
+         (d3 (sb-thread:make-thread (lambda ()
+                                      (loop while run
+                                            do (defclass test-3 (test-1 test-2) ((c :initform :new-c)))
+                                               (write-char #\3)
+                                               #-win32 (force-output)))
+                                    :name "d3"))
+         (i (sb-thread:make-thread (lambda ()
+                                     (loop while run
+                                           do (let ((i (make-instance 'test-3)))
+                                                (assert (member (slot-value i 'a) '(:orig-a :new-a)))
+                                                (assert (member (slot-value i 'b) '(:orig-b :new-b)))
+                                                (assert (member (slot-value i 'c) '(:orig-c :new-c))))
+                                              (write-char #\i)
+                                              #-win32 (force-output)))
+                                   :name "i")))
+    (format t "~%sleeping!~%")
+    (sleep 2.0)
+    (format t "~%stopping!~%")
+    (setf run nil)
+    (mapc (lambda (th)
+            (sb-thread:join-thread th)
+            (format t "~%joined ~S~%" (sb-thread:thread-name th)))
+          (list d1 d2 d3 i))
+    (force-output)))
+(format t "parallel defclass test done~%")
+
+(with-test (:name (:deadlock-detection :interrupts) :fails-on :win32)
+  #+win32                               ;be more explicit than just :skipped-on
+  (error "not attempting, because of deadlock error in background thread")
+  (let* ((m1 (sb-thread:make-mutex :name "M1"))
+         (m2 (sb-thread:make-mutex :name "M2"))
+         (t1-can-go (sb-thread:make-semaphore :name "T1 can go"))
+         (t2-can-go (sb-thread:make-semaphore :name "T2 can go"))
+         (t1 (sb-thread:make-thread
+              (lambda ()
+                (sb-thread:with-mutex (m1)
+                  (sb-thread:wait-on-semaphore t1-can-go)
+                  :ok1))
+              :name "T1"))
+         (t2 (sb-thread:make-thread
+              (lambda ()
+                (sb-ext:wait-for (eq t1 (sb-thread:mutex-owner m1)))
+                (sb-thread:with-mutex (m1 :wait-p t)
+                  (sb-thread:wait-on-semaphore t2-can-go)
+                  :ok2))
+              :name "T2")))
+    (sb-ext:wait-for (eq m1 (sb-thread::thread-waiting-for t2)))
+    (sb-thread:interrupt-thread t2 (lambda ()
+                                     (sb-thread:with-mutex (m2 :wait-p t)
+                                       (sb-ext:wait-for
+                                        (eq m2 (sb-thread::thread-waiting-for t1)))
+                                       (sb-thread:signal-semaphore t2-can-go))))
+    (sb-ext:wait-for (eq t2 (sb-thread:mutex-owner m2)))
+    (sb-thread:interrupt-thread t1 (lambda ()
+                                     (sb-thread:with-mutex (m2 :wait-p t)
+                                       (sb-thread:signal-semaphore t1-can-go))))
+    ;; both threads should finish without a deadlock or deadlock
+    ;; detection error
+    (let ((res (list (sb-thread:join-thread t1)
+                     (sb-thread:join-thread t2))))
+      (assert (equal '(:ok1 :ok2) res)))))
+
+(with-test (:name (:deadlock-detection :gc))
+  ;; To semi-reliably trigger the error (in SBCL's where)
+  ;; it was present you had to run this for > 30 seconds,
+  ;; but that's a bit long for a single test.
+  (let* ((stop (+ 5 (get-universal-time)))
+         (m1 (sb-thread:make-mutex :name "m1"))
+         (t1 (sb-thread:make-thread
+              (lambda ()
+                (loop until (> (get-universal-time) stop)
+                      do (sb-thread:with-mutex (m1)
+                           (eval `(make-array 24))))
+                :ok)))
+         (t2 (sb-thread:make-thread
+              (lambda ()
+                (loop until (> (get-universal-time) stop)
+                      do (sb-thread:with-mutex (m1)
+                           (eval `(make-array 24))))
+                :ok))))
+    (let ((res (list (sb-thread:join-thread t1)
+                     (sb-thread:join-thread t2))))
+      (assert (equal '(:ok :ok) res)))))
+
+(with-test (:name :spinlock-api)
+  (let* ((warned 0)
+         (funs
+           (handler-bind ((sb-int:early-deprecation-warning (lambda (_)
+                                                              (declare (ignore _))
+                                                              (incf warned))))
+             (list (compile nil `(lambda (lock)
+                                   (sb-thread::with-spinlock (lock)
+                                     t)))
+                   (compile nil `(lambda ()
+                                   (sb-thread::make-spinlock :name "foo")))
+                   (compile nil `(lambda (lock)
+                                   (sb-thread::get-spinlock lock)))
+                   (compile nil `(lambda (lock)
+                                   (sb-thread::release-spinlock lock)))))))
+    (assert (eql 4 warned))
+    (handler-bind ((warning #'error))
+      (destructuring-bind (with make get release) funs
+        (let ((lock (funcall make)))
+          (funcall get lock)
+          (funcall release lock)
+          (assert (eq t (funcall with lock))))))))
+
+(with-test (:name :interrupt-io-unnamed-pipe)
+  (let (result)
+    (labels
+        ((reader (fd)
+           (let ((stream (sb-sys:make-fd-stream fd
+                                                :element-type :default
+                                                :serve-events nil)))
+             (time
+              (let ((ok (handler-case
+                            (catch 'stop
+                              (progn
+                                (read-char stream)
+                                (sleep 0.1)
+                                (sleep 0.1)
+                                (sleep 0.1)))
+                          (error (c)
+                            c))))
+                (setf result ok)
+                (progn
+                  (format *trace-output* "~&=> ~A~%" ok)
+                  (force-output *trace-output*))))
+             (sleep 2)
+             (ignore-errors (close stream))))
+
+         (writer ()
+           (multiple-value-bind (read write)
+               (sb-unix:unix-pipe)
+             (let* ((reader (sb-thread:make-thread (lambda () (reader read))))
+                    (stream (sb-sys:make-fd-stream write
+                                                   :output t
+                                                   :element-type :default
+                                                   :serve-events nil))
+                    (ok :ok))
+               (sleep 1)
+               (sb-thread:interrupt-thread reader (lambda ()
+                                                    (print :throwing)
+                                                    (force-output)
+                                                    (throw 'stop ok)))
+               (sleep 1)
+               (setf ok :not-ok)
+               (write-char #\x stream)
+               (close stream)
+               (sb-thread:join-thread reader)))))
+      (writer))
+    (assert (eq result :ok))))
+
+(with-test (:name :thread-alloca)
+  (sb-ext:run-program "sh"
+                      '("run-compiler.sh" "-sbcl-pic" "-sbcl-shared"
+                        "alloca.c" "-o" "alloca.so")
+                      :search t)
+  (load-shared-object (truename "alloca.so"))
+
+  (alien-funcall (extern-alien "alloca_test" (function void)))
+  (sb-thread:join-thread
+   (sb-thread:make-thread
+    (lambda ()
+      (alien-funcall (extern-alien "alloca_test" (function void)))))))
+
+(with-test (:name :fp-mode-inheritance-threads)
+  (flet ((test ()
+           (let ((thread-fp-mode)
+                 (fp-mode (dpb 0 sb-vm::float-sticky-bits (sb-vm:floating-point-modes))))
+             (sb-thread:join-thread
+              (sb-thread:make-thread
+               (lambda ()
+                 (setf thread-fp-mode
+                       (dpb 0 sb-vm::float-sticky-bits (sb-vm:floating-point-modes))))))
+             (assert (= fp-mode thread-fp-mode)))))
+    (test)
+    (sb-int:with-float-traps-masked (:divide-by-zero)
+      (test))
+    (setf (sb-vm:floating-point-modes)
+          (dpb sb-vm:float-divide-by-zero-trap-bit
+               sb-vm::float-traps-byte
+               (sb-vm:floating-point-modes)))
+    (test)))