faster cancel and if delay is nil then cancel

vii · Jul 5, 2009 · dd3ff9d · dd3ff9d
1 parent 397950f
commit dd3ff9d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lib/timeout.lisp b/src/lib/timeout.lisp
@@ -40,6 +40,7 @@
 
 
 (my-defun timeout cancel ()
+  (my-declare-fast-inline)
   (quick-queue-entry-del me))
 
 (my-defun timeout merge ()
@@ -48,8 +49,11 @@
     (quick-queue-entry-add me (my position))))
 
 (my-defun timeout reset (delay)
-  (setf (my time) (time-for-delay delay))
-  (my merge))
+  (cond (delay	  
+	 (setf (my time) (time-for-delay delay))
+	 (my merge))
+	(t 
+	 (my cancel))))
 
 (my-defun timeout set (delay &optional func)
   (when func