X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fthreads.pure.lisp;h=bc2b94cc152d2323749d208b2b478a0b5d577183;hb=3fa2feb10ab827fc6cc2a85287e78b6e66b7bf4d;hp=b8ca206ef4db22412ca0901dd7111bd37df00631;hpb=a08efdfc11a98f4c7531cf67e0d4fdf5f274681f;p=sbcl.git

diff --git a/tests/threads.pure.lisp b/tests/threads.pure.lisp
index b8ca206..bc2b94c 100644
--- a/tests/threads.pure.lisp
+++ b/tests/threads.pure.lisp
@@ -180,28 +180,41 @@
       (assert (= 42 (join-thread child)))
       (assert (eq :from-child (symbol-value 'this-is-new))))))
 
-#+sb-thread
+;;; Disabled on Darwin due to deadlocks caused by apparent OS specific deadlocks,
+;;; wich _appear_ to be caused by malloc() and free() not being thread safe: an
+;;; interrupted malloc in one thread can apparently block a free in another. There
+;;; are also some indications that pthread_mutex_lock is not re-entrant.
+#+(and sb-thread (not darwin))
 (with-test (:name symbol-value-in-thread.3)
   (let* ((parent *current-thread*)
          (semaphore (make-semaphore))
          (running t)
          (noise (make-thread (lambda ()
                                (loop while running
-                                     do (setf * (make-array 1024)))))))
-
-    (loop repeat 10000
-          do (let* ((mom-mark (cons t t))
-                    (kid-mark (cons t t))
-                    (child (make-thread (lambda ()
-                                          (wait-on-semaphore semaphore)
-                                          (let ((old (symbol-value-in-thread 'this-is-new parent)))
-                                            (setf (symbol-value-in-thread 'this-is-new parent)
-                                                  (make-array 24 :initial-element kid-mark))
-                                            old)))))
-               (progv '(this-is-new) (list (make-array 24 :initial-element mom-mark))
-                 (signal-semaphore semaphore)
-                 (assert (eq mom-mark (aref (join-thread child) 0)))
-                 (assert (eq kid-mark (aref (symbol-value 'this-is-new) 0))))))
+                                     do (setf * (make-array 1024))
+                                     ;; Busy-wait a bit so we don't TOTALLY flood the
+                                     ;; system with GCs: a GC occurring in the middle of
+                                     ;; S-V-I-T causes it to start over -- we want that
+                                     ;; to occur occasionally, but not _all_ the time.
+                                        (loop repeat (random 128)
+                                              do (setf ** *)))))))
+    (write-string "; ")
+    (dotimes (i 15000)
+      (when (zerop (mod i 200))
+        (write-char #\.)
+        (force-output))
+      (let* ((mom-mark (cons t t))
+             (kid-mark (cons t t))
+             (child (make-thread (lambda ()
+                                   (wait-on-semaphore semaphore)
+                                   (let ((old (symbol-value-in-thread 'this-is-new parent)))
+                                     (setf (symbol-value-in-thread 'this-is-new parent)
+                                           (make-array 24 :initial-element kid-mark))
+                                     old)))))
+        (progv '(this-is-new) (list (make-array 24 :initial-element mom-mark))
+          (signal-semaphore semaphore)
+          (assert (eq mom-mark (aref (join-thread child) 0)))
+          (assert (eq kid-mark (aref (symbol-value 'this-is-new) 0))))))
     (setf running nil)
     (join-thread noise)))
 
@@ -228,7 +241,7 @@
                                          (cell-error-name e)
                                          (sb-thread::symbol-value-in-thread-error-info e))))))))
     (signal-semaphore semaphore)
-    (assert (equal (list *current-thread* 'this-is-new (list :read :unbound))
+    (assert (equal (list *current-thread* 'this-is-new (list :read :unbound-in-thread))
                    (join-thread child)))))
 
 #+sb-thread
@@ -246,26 +259,36 @@
                                          (sb-thread::symbol-value-in-thread-error-info e))))))))
     (signal-semaphore semaphore)
     (let ((res (join-thread child))
-          (want (list *current-thread* name (list :write :unbound))))
+          (want (list *current-thread* name (list :write :no-tls-value))))
       (unless (equal res want)
         (error "wanted ~S, got ~S" want res)))))
 
 #+sb-thread
 (with-test (:name symbol-value-in-thread.7)
-  (let ((child (make-thread (lambda ()))))
+  (let ((child (make-thread (lambda ())))
+        (error-occurred nil))
+    (join-thread child)
     (handler-case
         (symbol-value-in-thread 'this-is-new child)
       (symbol-value-in-thread-error (e)
+        (setf error-occurred t)
         (assert (eq child (thread-error-thread e)))
         (assert (eq 'this-is-new (cell-error-name e)))
-        (assert (equal (list :read :dead) (sb-thread::symbol-value-in-thread-error-info e)))))))
+        (assert (equal (list :read :thread-dead)
+                       (sb-thread::symbol-value-in-thread-error-info e)))))
+    (assert error-occurred)))
 
 #+sb-thread
 (with-test (:name symbol-value-in-thread.8)
-  (let ((child (make-thread (lambda ()))))
+  (let ((child (make-thread (lambda ())))
+        (error-occurred nil))
+    (join-thread child)
     (handler-case
         (setf (symbol-value-in-thread 'this-is-new child) t)
       (symbol-value-in-thread-error (e)
+        (setf error-occurred t)
         (assert (eq child (thread-error-thread e)))
         (assert (eq 'this-is-new (cell-error-name e)))
-        (assert (equal (list :write :dead) (sb-thread::symbol-value-in-thread-error-info e)))))))
+        (assert (equal (list :write :thread-dead)
+                       (sb-thread::symbol-value-in-thread-error-info e)))))
+    (assert error-occurred)))