-(in-package :sb!thread)
+;;;; cross-compile-time-only replacements for threading stuff
-(defun make-mutex (&key name value) nil)
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
+(in-package "SB!THREAD")
+
+(defun make-mutex (&key name value)
+ (declare (ignore name value))
+ nil)
+
+(defmacro with-mutex ((mutex) &body body)
+ (declare (ignore mutex))
+ `(locally ,@body))
(defmacro with-recursive-lock ((mutex) &body body)
- `(progn ,@body))
+ (declare (ignore mutex))
+ `(locally ,@body))
+;;;; support for threads in the target machine
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
(in-package "SB!THREAD")
;;; FIXME it would be good to define what a thread id is or isn't (our
;;; current assumption is that it's a fixnum). It so happens that on
;;; Linux it's a pid, but it might not be on posix thread implementations
-(sb!alien::define-alien-routine ("create_thread" %create-thread)
- sb!alien:unsigned-long
- (lisp-fun-address sb!alien:unsigned-long))
+(define-alien-routine ("create_thread" %create-thread)
+ unsigned-long
+ (lisp-fun-address unsigned-long))
-(sb!alien::define-alien-routine "signal_thread_to_dequeue"
- sb!alien:unsigned-int
- (thread-id sb!alien:unsigned-long))
+(define-alien-routine "signal_thread_to_dequeue"
+ unsigned-int
+ (thread-id unsigned-long))
(defvar *session* nil)
(setf (mutex-value lock) nil)
(futex-wake (mutex-value-address lock) 1))
-
-(defmacro with-mutex ((mutex &key value (wait-p t)) &body body)
- (with-unique-names (got)
- `(let ((,got (get-mutex ,mutex ,value ,wait-p)))
- (when ,got
- (unwind-protect
- (progn ,@body)
- (release-mutex ,mutex))))))
-
-
;;;; condition variables
(defun condition-wait (queue lock)
+;;;; unithread stub support for threads in the target machine
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
(in-package "SB!THREAD")
;;; used bu debug-int.lisp to access interrupt contexts
(return t))
(setf old-value t1))))
-(defmacro with-mutex ((mutex &key value (wait-p t)) &body body)
- (cond ((not wait-p)
- `(unless (mutex-value ,mutex)
- (unwind-protect
- (progn
- (setf (mutex-value ,mutex) (or ,value t))
- ,@body)
- (setf (mutex-value ,mutex) nil))))
- (t
- `(progn ,@body))))
+(defun get-mutex (lock &optional new-value (wait-p t))
+ (declare (type mutex lock))
+ (let ((old-value (mutex-value lock)))
+ (when (and old-value wait-p)
+ (error "In unithread mode, mutex ~S was requested with WAIT-P ~S and ~
+ new-value ~S, but has already been acquired (with value ~S)."
+ lock wait-p new-value old-value))
+ (setf (mutex-value lock) new-value)
+ t))
+
+(defun release-mutex (lock)
+ (declare (type mutex lock))
+ (setf (mutex-value lock) nil))
;;; what's the best thing to do with these on unithread? commented
;;; functions are the thread versions, just to remind me what they do
+;;;; support for threads needed at cross-compile time
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
(in-package "SB!THREAD")
+(sb!xc:defmacro with-mutex ((mutex &key value (wait-p t)) &body body)
+ #!-sb-thread (declare (ignore mutex value wait-p))
+ #!+sb-thread
+ (with-unique-names (got)
+ `(let ((,got (get-mutex ,mutex ,value ,wait-p)))
+ (when ,got
+ (unwind-protect
+ (locally ,@body)
+ (release-mutex ,mutex)))))
+ ;; KLUDGE: this separate expansion for (NOT SB-THREAD) is not
+ ;; strictly necessary; GET-MUTEX and RELEASE-MUTEX are implemented.
+ ;; However, there would be a (possibly slight) performance hit in
+ ;; using them.
+ #!-sb-thread
+ `(locally ,@body))
+
(sb!xc:defmacro with-recursive-lock ((mutex) &body body)
- (declare (ignore #!-sb-thread mutex))
+ #!-sb-thread (declare (ignore mutex))
#!+sb-thread
(with-unique-names (cfp)
`(let ((,cfp (sb!kernel:current-fp)))
;; confuse GC completely. -- CSR, 2003-06-03
(get-mutex ,mutex (sb!kernel:make-lisp-obj (sb!sys:sap-int ,cfp))))
(unwind-protect
- (progn ,@body)
+ (locally ,@body)
(when (sb!sys:sap= (sb!sys:int-sap
(sb!kernel:get-lisp-obj-address
(mutex-value ,mutex)))
,cfp)
(release-mutex ,mutex)))))
#!-sb-thread
- `(progn ,@body))
+ `(locally ,@body))
;;; checkins which aren't released. (And occasionally for internal
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.9.44"
+"0.8.9.45"
projects / sbcl.git / commitdiff