X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftimer.impure.lisp;h=bfdcb78c2f61750e787b840539536487c2d52aca;hb=22a6702974b7d6ff4e8f2b3b7b5ff446fc632de0;hp=d07a7a046b42e5d1c7f22aa07c3d91d6aca12e6d;hpb=40a26a4dd7f2891e78421ba465b99bb67f892856;p=sbcl.git

diff --git a/tests/timer.impure.lisp b/tests/timer.impure.lisp
index d07a7a0..bfdcb78 100644
--- a/tests/timer.impure.lisp
+++ b/tests/timer.impure.lisp
@@ -15,9 +15,9 @@
 
 (with-test (:name (:timer :relative))
   (let* ((has-run-p nil)
-         (timer (sb-impl::make-timer (lambda () (setq has-run-p t))
+         (timer (make-timer (lambda () (setq has-run-p t))
                             :name "simple timer")))
-    (sb-impl::schedule-timer timer 0.5)
+    (schedule-timer timer 0.5)
     (sleep 0.2)
     (assert (not has-run-p))
     (sleep 0.5)
@@ -26,50 +26,53 @@
 
 (with-test (:name (:timer :absolute))
   (let* ((has-run-p nil)
-         (timer (sb-impl::make-timer (lambda () (setq has-run-p t))
+         (timer (make-timer (lambda () (setq has-run-p t))
                             :name "simple timer")))
-    (sb-impl::schedule-timer timer (+ 1/2 (get-universal-time))
-                             :absolute-p t)
+    (schedule-timer timer (+ 1/2 (get-universal-time)) :absolute-p t)
     (sleep 0.2)
     (assert (not has-run-p))
     (sleep 0.5)
     (assert has-run-p)
     (assert (zerop (length (sb-impl::%pqueue-contents sb-impl::*schedule*))))))
 
-(defvar *x* nil)
-
 #+sb-thread
 (with-test (:name (:timer :other-thread))
-  (let* ((thread (sb-thread:make-thread (lambda () (let ((*x* t)) (sleep 2)))))
-         (timer (sb-impl::make-timer (lambda () (assert *x*)) :thread thread)))
-    (sb-impl::schedule-timer timer 0.1)))
+  (let* ((thread (sb-thread:make-thread (lambda () (sleep 2))))
+         (timer (make-timer (lambda ()
+                              (assert (eq thread sb-thread:*current-thread*)))
+                            :thread thread)))
+    (schedule-timer timer 0.1)))
 
 #+sb-thread
 (with-test (:name (:timer :new-thread))
-  (let ((*x* t)
-        (timer (sb-impl::make-timer (lambda () (assert (not *x*))) :thread t)))
-    (sb-impl::schedule-timer timer 0.1)))
+  (let* ((original-thread sb-thread:*current-thread*)
+         (timer (make-timer
+                 (lambda ()
+                   (assert (not (eq original-thread
+                                    sb-thread:*current-thread*))))
+                 :thread t)))
+    (schedule-timer timer 0.1)))
 
 (with-test (:name (:timer :repeat-and-unschedule))
   (let* ((run-count 0)
          timer)
     (setq timer
-          (sb-impl::make-timer (lambda ()
+          (make-timer (lambda ()
                         (when (= 5 (incf run-count))
-                          (sb-impl::unschedule-timer timer)))))
-    (sb-impl::schedule-timer timer 0 :repeat-interval 0.2)
-    (assert (not (sb-impl::timer-expired-p timer 0.3)))
+                          (unschedule-timer timer)))))
+    (schedule-timer timer 0 :repeat-interval 0.2)
+    (assert (timer-scheduled-p timer :delta 0.3))
     (sleep 1.3)
     (assert (= 5 run-count))
-    (assert (sb-impl::timer-expired-p timer))
+    (assert (not (timer-scheduled-p timer)))
     (assert (zerop (length (sb-impl::%pqueue-contents sb-impl::*schedule*))))))
 
 (with-test (:name (:timer :reschedule))
   (let* ((has-run-p nil)
-         (timer (sb-impl::make-timer (lambda ()
+         (timer (make-timer (lambda ()
                               (setq has-run-p t)))))
-    (sb-impl::schedule-timer timer 0.2)
-    (sb-impl::schedule-timer timer 0.3)
+    (schedule-timer timer 0.2)
+    (schedule-timer timer 0.3)
     (sleep 0.5)
     (assert has-run-p)
     (assert (zerop (length (sb-impl::%pqueue-contents sb-impl::*schedule*))))))
@@ -77,8 +80,7 @@
 (with-test (:name (:timer :stress))
   (let ((time (1+ (get-universal-time))))
     (loop repeat 200 do
-          (sb-impl::schedule-timer (sb-impl::make-timer (lambda ())) time
-                                   :absolute-p t))
+          (schedule-timer (make-timer (lambda ())) time :absolute-p t))
     (sleep 2)
     (assert (zerop (length (sb-impl::%pqueue-contents sb-impl::*schedule*))))))
 
@@ -107,3 +109,12 @@
           (sb-ext:with-timeout 0.5
             (sb-ext:with-timeout 2
               (sleep 2))))))
+
+#+sb-thread
+(with-test (:name (:with-timeout :many-at-the-same-time))
+  (loop repeat 10 do
+        (sb-thread:make-thread
+         (lambda ()
+           (sb-ext:with-timeout 0.5
+             (sleep 5)
+             (assert nil))))))