X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fthreads.pure.lisp;h=7502f53cfdc3eabad8deeb490f3b45eba7796887;hb=1cba0af01f5107ab384d0d8b94b1f6330b3d0ef4;hp=adcf13a0a9263cfc9fc1fdef14100de463dfb153;hpb=c6fecd1dcff10bce2e88f67bfade3aab3f7309ac;p=sbcl.git diff --git a/tests/threads.pure.lisp b/tests/threads.pure.lisp index adcf13a..7502f53 100644 --- a/tests/threads.pure.lisp +++ b/tests/threads.pure.lisp @@ -14,16 +14,29 @@ (in-package :cl-user) (defpackage :thread-test - (:use :cl :sb-thread)) + (:use :cl :sb-thread :sb-ext)) (in-package :thread-test) (use-package :test-util) +(with-test (:name atomic-update + :skipped-on '(not :sb-thread)) + (let ((x (cons :count 0)) + (nthreads (ecase sb-vm:n-word-bits (32 100) (64 1000)))) + (mapc #'sb-thread:join-thread + (loop repeat nthreads + collect (sb-thread:make-thread + (lambda () + (loop repeat 1000 + do (atomic-update (cdr x) #'1+) + (sleep 0.00001)))))) + (assert (equal x `(:count ,@(* 1000 nthreads)))))) + (with-test (:name mutex-owner) ;; Make sure basics are sane on unithreaded ports as well (let ((mutex (make-mutex))) - (get-mutex mutex) + (grab-mutex mutex) (assert (eq *current-thread* (mutex-value mutex))) (handler-bind ((warning #'error)) (release-mutex mutex)) @@ -42,8 +55,9 @@ ;;; Condition-wait should not be interruptible under WITHOUT-INTERRUPTS -(with-test (:name without-interrupts+condition-wait - :skipped-on '(not :sb-thread)) +(with-test (:name :without-interrupts+condition-wait + :skipped-on '(not :sb-thread) + :fails-on '(and :win32 :sb-futex)) (let* ((lock (make-mutex)) (queue (make-waitqueue)) (thread (make-thread (lambda () @@ -59,11 +73,11 @@ (sleep 1) (assert (not (thread-alive-p thread))))) -;;; GET-MUTEX should not be interruptible under WITHOUT-INTERRUPTS +;;; GRAB-MUTEX should not be interruptible under WITHOUT-INTERRUPTS -(with-test (:name without-interrupts+get-mutex :skipped-on '(not :sb-thread)) +(with-test (:name :without-interrupts+grab-mutex :skipped-on '(not :sb-thread)) (let* ((lock (make-mutex)) - (bar (progn (get-mutex lock) nil)) + (bar (progn (grab-mutex lock) nil)) (thread (make-thread (lambda () (sb-sys:without-interrupts (with-mutex (lock) @@ -79,7 +93,7 @@ (assert (eq :aborted (join-thread thread :default :aborted))) (assert bar))) -(with-test (:name parallel-find-class :skipped-on '(not :sb-thread)) +(with-test (:name :parallel-find-class :skipped-on '(not :sb-thread)) (let* ((oops nil) (threads (loop repeat 10 collect (make-thread (lambda () @@ -157,14 +171,14 @@ ;;;; SYMBOL-VALUE-IN-THREAD -(with-test (:name symbol-value-in-thread.1) +(with-test (:name :symbol-value-in-thread.1) (let ((* (cons t t))) (assert (eq * (symbol-value-in-thread '* *current-thread*))) (setf (symbol-value-in-thread '* *current-thread*) 123) (assert (= 123 (symbol-value-in-thread '* *current-thread*))) (assert (= 123 *)))) -(with-test (:name symbol-value-in-thread.2 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.2 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -179,11 +193,9 @@ ;;; 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. -(with-test (:name symbol-value-in-thread.3 - :skipped-on '(not :sb-thread) - :broken-on :darwin) +;;; interrupted malloc in one thread can apparently block a free in another. +(with-test (:name :symbol-value-in-thread.3 + :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (running t) @@ -197,7 +209,7 @@ (loop repeat (random 128) do (setf ** *))))))) (write-string "; ") - (dotimes (i 15000) + (dotimes (i #+win32 2000 #-win32 15000) (when (zerop (mod i 200)) (write-char #\.) (force-output)) @@ -216,7 +228,7 @@ (setf running nil) (join-thread noise))) -(with-test (:name symbol-value-in-thread.4 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.4 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -225,7 +237,7 @@ (signal-semaphore semaphore) (assert (equal '(nil nil) (multiple-value-list (join-thread child)))))) -(with-test (:name symbol-value-in-thread.5 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.5 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (child (make-thread (lambda () @@ -240,7 +252,7 @@ (assert (equal (list *current-thread* 'this-is-new (list :read :unbound-in-thread)) (join-thread child))))) -(with-test (:name symbol-value-in-thread.6 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.6 :skipped-on '(not :sb-thread)) (let* ((parent *current-thread*) (semaphore (make-semaphore)) (name (gensym)) @@ -258,7 +270,7 @@ (unless (equal res want) (error "wanted ~S, got ~S" want res))))) -(with-test (:name symbol-value-in-thread.7 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.7 :skipped-on '(not :sb-thread)) (let ((child (make-thread (lambda ()))) (error-occurred nil)) (join-thread child) @@ -272,7 +284,7 @@ (sb-thread::symbol-value-in-thread-error-info e))))) (assert error-occurred))) -(with-test (:name symbol-value-in-thread.8 :skipped-on '(not :sb-thread)) +(with-test (:name :symbol-value-in-thread.8 :skipped-on '(not :sb-thread)) (let ((child (make-thread (lambda ()))) (error-occurred nil)) (join-thread child) @@ -286,7 +298,7 @@ (sb-thread::symbol-value-in-thread-error-info e))))) (assert error-occurred))) -(with-test (:name deadlock-detection.1 :skipped-on '(not :sb-thread)) +(with-test (:name :deadlock-detection.1 :skipped-on '(not :sb-thread)) (loop repeat 1000 do (flet ((test (ma mb sa sb) @@ -307,15 +319,12 @@ (t1 (sb-thread:make-thread (test m1 m2 s1 s2) :name "T1")) (t2 (sb-thread:make-thread (test m2 m1 s2 s1) :name "T2"))) ;; One will deadlock, and the other will then complete normally. - ;; ...except sometimes, when we get unlucky, and both will do - ;; the deadlock detection in parallel and both signal. (let ((res (list (sb-thread:join-thread t1) (sb-thread:join-thread t2)))) (assert (or (equal '(:deadlock :ok) res) - (equal '(:ok :deadlock) res) - (equal '(:deadlock :deadlock) res)))))))) + (equal '(:ok :deadlock) res)))))))) -(with-test (:name deadlock-detection.2 :skipped-on '(not :sb-thread)) +(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")) @@ -350,7 +359,7 @@ (assert (stringp err))) (assert (eq :ok (sb-thread:join-thread t1))))) -(with-test (:name deadlock-detection.3 :skipped-on '(not :sb-thread)) +(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")) @@ -476,7 +485,7 @@ collect (make-thread (lambda () (sleep (random 0.02)) - (wait-on-semaphore sem :timeout 0.01))))))) + (wait-on-semaphore sem :timeout 0.5))))))) (loop repeat 5 do (signal-semaphore sem 2)) (let ((ok (count-if #'join-thread threads))) @@ -487,12 +496,12 @@ :skipped-on '(not :sb-thread)) (assert (eq :error (handler-case - (join-thread (make-thread (lambda () (sleep 10))) :timeout 0.01) + (join-thread (make-join-thread (lambda () (sleep 10))) :timeout 0.01) (join-thread-error () :error)))) (let ((cookie (cons t t))) (assert (eq cookie - (join-thread (make-thread (lambda () (sleep 10))) + (join-thread (make-join-thread (lambda () (sleep 10))) :timeout 0.01 :default cookie))))) @@ -518,7 +527,7 @@ #+sb-thread (sb-thread::block-deferrable-signals)))))) (let* ((threads (loop for i from 1 upto 100 - collect (make-thread #'critical :name (format nil "T~A" i)))) + collect (make-join-thread #'critical :name (format nil "T~A" i)))) (safe nil) (unsafe nil) (interruptor (make-thread (lambda () @@ -552,3 +561,59 @@ (signal-semaphore sem) (try-semaphore sem 1 note) (assert (semaphore-notification-status note)))) + +(with-test (:name (:return-from-thread :normal-thread) + :skipped-on '(not :sb-thread)) + (let* ((thread (make-thread (lambda () + (return-from-thread (values 1 2 3)) + :foo))) + (values (multiple-value-list (join-thread thread)))) + (unless (equal (list 1 2 3) values) + (error "got ~S, wanted (1 2 3)" values)))) + +(with-test (:name (:return-from-thread :main-thread)) + (assert (main-thread-p)) + (assert (eq :oops + (handler-case + (return-from-thread t) + (thread-error () + :oops))))) + +(with-test (:name (:abort-thread :normal-thread) + :skipped-on '(not :sb-thread)) + (let ((thread (make-thread (lambda () + (abort-thread) + :foo)))) + (assert (eq :aborted! (join-thread thread :default :aborted!))))) + +(with-test (:name (:abort-thread :main-thread)) + (assert (main-thread-p)) + (assert (eq :oops + (handler-case + (abort-thread) + (thread-error () + :oops))))) + +;; SB-THREAD:MAKE-THREAD used to lock SB-THREAD:*MAKE-THREAD-LOCK* +;; before entering WITHOUT-INTERRUPTS. When a thread which was +;; executing SB-THREAD:MAKE-THREAD was interrupted with code which +;; also called SB-THREAD:MAKE-THREAD, it could happen that the first +;; thread already owned SB-THREAD:*MAKE-THREAD-LOCK* and the +;; interrupting code thus made a recursive lock attempt. +;; +;; See (:TIMER :DISPATCH-THREAD :MAKE-THREAD :BUG-1180102) in +;; timer.impure.lisp. +(with-test (:name (make-thread :interrupt-with make-thread :bug-1180102) + :skipped-on '(not :sb-thread)) + (dotimes (i 100) + (let ((threads '()) + (parent *current-thread*)) + (dotimes (i 100) + (push (make-thread + (lambda () + (interrupt-thread + parent + (lambda () (push (make-thread (lambda ())) threads))))) + threads) + (push (make-thread (lambda ())) threads)) + (mapc #'join-thread threads))))