r10151: updates

[kmrcl.git] / processes.lisp

diff --git a/processes.lisp b/processes.lisp
index 64921f7692eda5f84a52b4aa081db4cc5ebe254d..88aa05113da3613e973a863dd318fc2d4d275be9 100644 (file)
--- a/processes.lisp
+++ b/processes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  June 2003
 ;;;;
-;;;; $Id: processes.lisp,v 1.2 2003/07/09 22:12:52 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
 (in-package #:kmrcl)
@@ -24,7 +24,7 @@
 (defun destroy-process (process)
   #+cmu (mp:destroy-process process)
   #+allegro (mp:process-kill process)
-  #+sbcl-thread (sb-thread:destroy-thread process)
+  #+sb-thread (sb-thread:destroy-thread process)
   #+lispworks (mp:process-kill process)
   )
 
@@ -32,7 +32,7 @@
   #+allegro (mp:make-process-lock :name name)
   #+cmu (mp:make-lock name)
   #+lispworks (mp:make-lock :name name)
-  #+sbcl-thread (sb-thread:make-mutex :name name)
+  #+sb-thread (sb-thread:make-mutex :name name)
   )
 
 (defmacro with-lock-held ((lock) &body body)
@@ -42,8 +42,25 @@
   `(mp:with-lock-held (,lock) ,@body)
   #+lispworks
   `(mp:with-lock (,lock) ,@body)
-  #+sbcl-thread
-  `(sb-thread:with-recursive-lock (,lock) ,@body)
+  #+sb-thread
+  `(sb-thread:with-mutex (,lock) ,@body)
+  #-(or allegro cmu lispworks sb-thread)
+  `(progn ,@body)
   )
 
 
+(defmacro with-timeout ((seconds) &body body)
+  #+allegro
+  `(mp:with-timeout (,seconds) ,@body)
+  #+cmu
+  `(mp:with-timeout (,seconds) ,@body)
+  #+sb-thread
+  `(sb-ext:with-timeout ,seconds ,@body)
+  #-(or allegro cmu sb-thread)
+  `(progn ,@body)
+  )
+  
+(defun process-sleep (n)
+  #+allegro (mp:process-sleep n)
+  #-allegro (sleep n))
+