Version 1.102 (other changes not in last commit)

[kmrcl.git] / processes.lisp

diff --git a/processes.lisp b/processes.lisp
index 1cc6a473ed6d3faed93a93d193cb58991af06abb..7017ce74e73d95f9cc8fe4fdd57e64d4919f5965 100644 (file)
--- a/processes.lisp
+++ b/processes.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: modlisp -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -6,8 +6,6 @@
 ;;;; Purpose:       Multiprocessing functions
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  June 2003
-;;;;
-;;;; $Id: processes.lisp,v 1.4 2003/07/13 04:53:32 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:kmrcl)
@@ -17,8 +15,9 @@
   #+allegro (mp:process-run-function name func)
   #+cmu (mp:make-process func :name name)
   #+lispworks (mp:process-run-function name nil func)
-  #+sb-thread (sb-thread:make-thread func)
-  #-(or allegro cmu lispworks sb-thread) (funcall func)
+  #+sb-thread (sb-thread:make-thread func :name name)
+  #+openmcl (ccl:process-run-function name func)
+  #-(or allegro cmu lispworks sb-thread openmcl) (funcall func)
   )
 
 (defun destroy-process (process)
@@ -26,13 +25,15 @@
   #+allegro (mp:process-kill process)
   #+sb-thread (sb-thread:destroy-thread process)
   #+lispworks (mp:process-kill process)
+  #+openmcl (ccl:process-kill process)
   )
 
 (defun make-lock (name)
   #+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)
+  #+openmcl (ccl:make-lock name)
   )
 
 (defmacro with-lock-held ((lock) &body body)
@@ -42,9 +43,11 @@
   `(mp:with-lock-held (,lock) ,@body)
   #+lispworks
   `(mp:with-lock (,lock) ,@body)
-  #+sbcl-thread
+  #+sb-thread
   `(sb-thread:with-recursive-lock (,lock) ,@body)
-  #-(or allegro cmu lispworks sbcl-thread)
+  #+openmcl
+  `(ccl:with-lock-grabbed (,lock) ,@body)
+  #-(or allegro cmu lispworks sb-thread openmcl)
   `(progn ,@body)
   )
 
@@ -54,12 +57,17 @@
   `(mp:with-timeout (,seconds) ,@body)
   #+cmu
   `(mp:with-timeout (,seconds) ,@body)
-  #+sbcl-thread
+  #+sb-thread
   `(sb-ext:with-timeout ,seconds ,@body)
-  #-(or allegro cmu sbcl-thread)
+  #+openmcl
+  `(ccl:process-wait-with-timeout "waiting"
+                                 (* ,seconds ccl:*ticks-per-second*)
+                                 #'(lambda ()
+                                     ,@body) nil)
+  #-(or allegro cmu sb-thread openmcl)
   `(progn ,@body)
   )
-  
+
 (defun process-sleep (n)
   #+allegro (mp:process-sleep n)
   #-allegro (sleep n))