X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fdeadline.impure.lisp;h=44990e89a611b4030bac49358fc55f882792d317;hb=1cba0af01f5107ab384d0d8b94b1f6330b3d0ef4;hp=9d0b4f97962e7811078b77d5ec1541bb57e258b6;hpb=682b7487bec22dd9a2994d9de4307a1c4418bb78;p=sbcl.git

diff --git a/tests/deadline.impure.lisp b/tests/deadline.impure.lisp
index 9d0b4f9..44990e8 100644
--- a/tests/deadline.impure.lisp
+++ b/tests/deadline.impure.lisp
@@ -1,3 +1,7 @@
+(in-package :cl-user)
+
+(use-package :test-util)
+
 (defmacro assert-timeout (form)
   (let ((ok (gensym "OK")))
     `(let ((,ok ',ok))
@@ -7,30 +11,106 @@
                        ,ok)))
          (error "No timeout from form:~%  ~S" ',form)))))
 
+(defun run-sleep (seconds)
+  (sb-ext:run-program "sleep" (list (format nil "~D" seconds))
+                      :search t :wait t))
+
+(with-test (:name (:deadline :run-program :trivial) :fails-on :win32)
+  (assert-timeout (sb-sys:with-deadline (:seconds 1)
+                    (run-sleep 3))))
 
-(assert-timeout
- (sb-impl::with-deadline (:seconds 1)
-   (run-program "sleep" '("5") :search t :wait t)))
+(with-test (:name (:deadline :defer-deadline-1) :fails-on :win32)
+  (let ((n 0)
+        (final nil))
+    (handler-case
+        (handler-bind ((sb-sys:deadline-timeout
+                        #'(lambda (c)
+                            (when (< n 2)
+                              (incf n)
+                              (sb-sys:defer-deadline 0.1 c)))))
+          (sb-sys:with-deadline (:seconds 1)
+            (run-sleep 2)))
+      (sb-sys:deadline-timeout (c)
+        (setf final c)))
+    (assert (= n 2))
+    (assert final)))
 
-#+(and sb-thread (not sb-lutex))
-(progn
+(with-test (:name (:deadline :defer-deadline-2) :fails-on :win32)
+  (let ((n 0)
+        (final nil))
+    (handler-case
+        (handler-bind ((sb-sys:deadline-timeout
+                        #'(lambda (c)
+                            (incf n)
+                            (sb-sys:defer-deadline 0.1 c))))
+          (sb-sys:with-deadline (:seconds 1)
+            (run-sleep 2)))
+      (sb-sys:deadline-timeout (c)
+        (setf final c)))
+    (assert (plusp n))
+    (assert (not final))))
+
+(with-test (:name (:deadline :cancel-deadline) :fails-on :win32)
+  (let ((n 0)
+        (final nil))
+    (handler-case
+        (handler-bind ((sb-sys:deadline-timeout
+                        #'(lambda (c)
+                            (incf n)
+                            (sb-sys:cancel-deadline c))))
+          (sb-sys:with-deadline (:seconds 1)
+            (run-sleep 2)))
+      (sb-sys:deadline-timeout (c)
+        (setf final c)))
+    (assert (= n 1))
+    (assert (not final))))
+
+(with-test (:name (:deadline :grab-mutex) :skipped-on '(not :sb-thread))
   (assert-timeout
    (let ((lock (sb-thread:make-mutex))
          (waitp t))
-     (sb-thread:make-thread (lambda ()
-                              (sb-thread:get-mutex lock)
-                              (setf waitp nil)
-                              (sleep 5)))
+     (make-join-thread (lambda ()
+                         (sb-thread:grab-mutex lock)
+                         (setf waitp nil)
+                         (sleep 5)))
      (loop while waitp do (sleep 0.01))
-     (sb-impl::with-deadline (:seconds 1)
-       (sb-thread:get-mutex lock))))
+     (sb-sys:with-deadline (:seconds 1)
+       (sb-thread:grab-mutex lock)))))
 
+(with-test (:name (:deadline :wait-on-semaphore) :skipped-on '(not :sb-thread))
   (assert-timeout
    (let ((sem (sb-thread::make-semaphore :count 0)))
-     (sb-impl::with-deadline (:seconds 1)
-       (sb-thread::wait-on-semaphore sem))))
+     (sb-sys:with-deadline (:seconds 1)
+       (sb-thread::wait-on-semaphore sem)))))
 
+(with-test (:name (:deadline :join-thread) :skipped-on '(not :sb-thread))
   (assert-timeout
-   (sb-impl::with-deadline (:seconds 1)
+   (sb-sys:with-deadline (:seconds 1)
      (sb-thread:join-thread
-      (sb-thread:make-thread (lambda () (loop (sleep 1))))))))
+      (make-kill-thread (lambda () (loop (sleep 1))))))))
+
+(with-test (:name (:deadline :futex-wait-eintr) :skipped-on '(not :sb-thread))
+  (let ((lock (sb-thread:make-mutex))
+        (waitp t))
+    (make-join-thread (lambda ()
+                        (sb-thread:grab-mutex lock)
+                        (setf waitp nil)
+                        (sleep 5)))
+    (loop while waitp do (sleep 0.01))
+    (let ((thread (make-join-thread
+                   (lambda ()
+                     (let ((start (get-internal-real-time)))
+                       (handler-case
+                           (sb-sys:with-deadline (:seconds 1)
+                             (sb-thread:grab-mutex lock))
+                         (sb-sys:deadline-timeout (x)
+                           (declare (ignore x))
+                           (let ((end (get-internal-real-time)))
+                             (float (/ (- end start)
+                                       internal-time-units-per-second)
+                                    0.0)))))))))
+      (sleep 0.3)
+      (sb-thread:interrupt-thread thread (lambda () 42))
+      (let ((seconds-passed (sb-thread:join-thread thread)))
+        (format t "Deadline in ~S~%" seconds-passed)
+        (assert (< seconds-passed 1.2))))))