X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fthreads.pure.lisp;h=2623216c488fe8ab340317bac1901969cd4320bb;hb=ecfd159f29d31d2cc08d4e5598346c04c9387636;hp=9b6e91e224b1d55c56219eac2c174f476f9bff87;hpb=94b4d570ffa374e2adf2e27340472c13a487d1f5;p=sbcl.git diff --git a/tests/threads.pure.lisp b/tests/threads.pure.lisp index 9b6e91e..2623216 100644 --- a/tests/threads.pure.lisp +++ b/tests/threads.pure.lisp @@ -51,9 +51,9 @@ ;;; Condition-wait should not be interruptible under WITHOUT-INTERRUPTS -#+sb-thread (with-test (:name without-interrupts+condition-wait - :fails-on :sb-lutex) + :fails-on :sb-lutex + :skipped-on '(not :sb-thread)) (let* ((lock (make-mutex)) (queue (make-waitqueue)) (thread (make-thread (lambda () @@ -71,8 +71,7 @@ ;;; GET-MUTEX should not be interruptible under WITHOUT-INTERRUPTS -#+sb-thread -(with-test (:name without-interrupts+get-mutex) +(with-test (:name without-interrupts+get-mutex :skipped-on '(not :sb-thread)) (let* ((lock (make-mutex)) (bar (progn (get-mutex lock) nil)) (thread (make-thread (lambda () @@ -90,8 +89,7 @@ (assert (eq :aborted (join-thread thread :default :aborted))) (assert bar))) -#+sb-thread -(with-test (:name parallel-find-class) +(with-test (:name parallel-find-class :skipped-on '(not :sb-thread)) (let* ((oops nil) (threads (loop repeat 10 collect (make-thread (lambda () @@ -103,8 +101,7 @@ (mapcar #'sb-thread:join-thread threads) (assert (not oops)))) -#+sb-thread -(with-test (:name :semaphore-multiple-waiters) +(with-test (:name :semaphore-multiple-waiters :skipped-on '(not :sb-thread)) (let ((semaphore (make-semaphore :name "test sem"))) (labels ((make-readers (n i) (values @@ -159,8 +156,7 @@ ;;;; Printing waitqueues -#+sb-thread -(with-test (:name :waitqueue-circle-print) +(with-test (:name :waitqueue-circle-print :skipped-on '(not :sb-thread)) (let* ((*print-circle* nil) (lock (sb-thread:make-mutex)) (wq (sb-thread:make-waitqueue))) @@ -178,8 +174,7 @@ (assert (= 123 (symbol-value-in-thread '* *current-thread*))) (assert (= 123 *)))) -#+sb-thread -(with-test (:name symbol-value-in-thread.2) +(with-test (:name symbol-value-in-thread.2 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -196,8 +191,7 @@ ;;; 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) +(with-test (:name symbol-value-in-thread.3 :skipped-on '(not :sb-thread) :broken-on :darwin) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (running t) @@ -230,8 +224,7 @@ (setf running nil) (join-thread noise))) -#+sb-thread -(with-test (:name symbol-value-in-thread.4) +(with-test (:name symbol-value-in-thread.4 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -240,8 +233,7 @@ (signal-semaphore semaphore) (assert (equal '(nil nil) (multiple-value-list (join-thread child)))))) -#+sb-thread -(with-test (:name symbol-value-in-thread.5) +(with-test (:name symbol-value-in-thread.5 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -256,8 +248,7 @@ (assert (equal (list *current-thread* 'this-is-new (list :read :unbound-in-thread)) (join-thread child))))) -#+sb-thread -(with-test (:name symbol-value-in-thread.6) +(with-test (:name symbol-value-in-thread.6 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (name (gensym)) @@ -275,8 +266,7 @@ (unless (equal res want) (error "wanted ~S, got ~S" want res))))) -#+sb-thread -(with-test (:name symbol-value-in-thread.7) +(with-test (:name symbol-value-in-thread.7 :skipped-on '(not :sb-thread)) (let ((child (make-thread (lambda ()))) (error-occurred nil)) (join-thread child) @@ -290,8 +280,7 @@ (sb-thread::symbol-value-in-thread-error-info e))))) (assert error-occurred))) -#+sb-thread -(with-test (:name symbol-value-in-thread.8) +(with-test (:name symbol-value-in-thread.8 :skipped-on '(not :sb-thread)) (let ((child (make-thread (lambda ()))) (error-occurred nil)) (join-thread child) @@ -305,8 +294,7 @@ (sb-thread::symbol-value-in-thread-error-info e))))) (assert error-occurred))) -#+sb-thread -(with-test (:name deadlock-detection.1) +(with-test (:name deadlock-detection.1 :skipped-on '(not :sb-thread)) (loop repeat 1000 do (flet ((test (ma mb sa sb) @@ -335,8 +323,7 @@ (equal '(:ok :deadlock) res) (equal '(:deadlock :deadlock) res)))))))) -#+sb-thread -(with-test (:name deadlock-detection.2) +(with-test (:name deadlock-detection.2 :skipped-on '(not :sb-thread)) (let* ((m1 (sb-thread:make-mutex :name "M1")) (m2 (sb-thread:make-mutex :name "M2")) (s1 (sb-thread:make-semaphore :name "S1")) @@ -371,8 +358,7 @@ (assert (stringp err))) (assert (eq :ok (sb-thread:join-thread t1))))) -#+sb-thread -(with-test (:name deadlock-detection.3) +(with-test (:name deadlock-detection.3 :skipped-on '(not :sb-thread)) (let* ((m1 (sb-thread:make-mutex :name "M1")) (m2 (sb-thread:make-mutex :name "M2")) (s1 (sb-thread:make-semaphore :name "S1")) @@ -404,8 +390,7 @@ :deadlock)))) (assert (eq :ok (join-thread t1))))) -#+sb-thread -(with-test (:name deadlock-detection.4) +(with-test (:name deadlock-detection.4 :skipped-on '(not :sb-thread)) (loop repeat 1000 do (flet ((test (ma mb sa sb) @@ -434,8 +419,7 @@ (equal '(:ok :deadlock) res) (equal '(:deadlock :deadlock) res)))))))) -#+sb-thread -(with-test (:name deadlock-detection.5) +(with-test (:name deadlock-detection.5 :skipped-on '(not :sb-thread)) (let* ((m1 (sb-thread::make-spinlock :name "M1")) (m2 (sb-thread::make-spinlock :name "M2")) (s1 (sb-thread:make-semaphore :name "S1")) @@ -470,8 +454,7 @@ (assert (stringp err))) (assert (eq :ok (sb-thread:join-thread t1))))) -#+sb-thread -(with-test (:name deadlock-detection.7) +(with-test (:name deadlock-detection.7 :skipped-on '(not :sb-thread)) (let* ((m1 (sb-thread::make-spinlock :name "M1")) (m2 (sb-thread::make-spinlock :name "M2")) (s1 (sb-thread:make-semaphore :name "S1")) @@ -498,3 +481,47 @@ (sb-thread:thread-deadlock () :deadlock)))) (assert (eq :ok (join-thread t1))))) + +#+sb-thread +(with-test (:name :pass-arguments-to-thread) + (assert (= 3 (join-thread (make-thread #'+ :arguments '(1 2)))))) + +#+sb-thread +(with-test (:name :pass-atom-to-thread) + (assert (= 1/2 (join-thread (make-thread #'/ :arguments 2))))) + +#+sb-thread +(with-test (:name :pass-nil-to-thread) + (assert (= 1 (join-thread (make-thread #'* :arguments '()))))) + +#+sb-thread +(with-test (:name :pass-nothing-to-thread) + (assert (= 1 (join-thread (make-thread #'*))))) + +#+sb-thread +(with-test (:name :pass-improper-list-to-thread) + (multiple-value-bind (value error) + (ignore-errors (make-thread #'+ :arguments '(1 . 1))) + (when value + (join-thread value)) + (assert (and (null value) + error)))) + +(with-test (:name (:wait-for :basics)) + (assert (not (sb-ext:wait-for nil :timeout 0.1))) + (assert (eql 42 (sb-ext:wait-for 42))) + (let ((n 0)) + (assert (eql 100 (sb-ext:wait-for (when (= 100 (incf n)) + n)))))) + +(with-test (:name (:wait-for :deadline)) + (assert (eq :ok + (sb-sys:with-deadline (:seconds 10) + (assert (not (sb-ext:wait-for nil :timeout 0.1))) + :ok))) + (assert (eq :deadline + (handler-case + (sb-sys:with-deadline (:seconds 0.1) + (sb-ext:wait-for nil :timeout 10) + (error "oops")) + (sb-sys:deadline-timeout () :deadline)))))