"Acquire MUTEX for the dynamic scope of BODY, setting it to
NEW-VALUE or some suitable default value if NIL. If WAIT-P is non-NIL
and the mutex is in use, sleep until it is available"
- `(call-with-mutex
- (lambda () ,@body)
- ,mutex
- ,value
- ,wait-p))
+ `(dx-flet ((with-mutex-thunk () ,@body))
+ (call-with-mutex
+ #'with-mutex-thunk
+ ,mutex
+ ,value
+ ,wait-p)))
(sb!xc:defmacro with-system-mutex ((mutex &key without-gcing) &body body)
- `(call-with-system-mutex
- (lambda () ,@body)
- ,mutex
- ,without-gcing))
+ `(dx-flet ((with-system-mutex-thunk () ,@body))
+ (call-with-system-mutex
+ #'with-system-mutex-thunk
+ ,mutex
+ ,without-gcing)))
(sb!xc:defmacro with-recursive-lock ((mutex) &body body)
#!+sb-doc
further recursive lock attempts for the same mutex succeed. It is
allowed to mix WITH-MUTEX and WITH-RECURSIVE-LOCK for the same mutex
provided the default value is used for the mutex."
- `(call-with-recursive-lock
- (lambda () ,@body)
- ,mutex))
+ `(dx-flet ((with-recursive-lock-thunk () ,@body))
+ (call-with-recursive-lock
+ #'with-recursive-lock-thunk
+ ,mutex)))
(sb!xc:defmacro with-recursive-spinlock ((spinlock) &body body)
- `(call-with-recursive-spinlock
- (lambda () ,@body)
- ,spinlock))
+ `(dx-flet ((with-recursive-spinlock-thunk () ,@body))
+ (call-with-recursive-spinlock
+ #'with-recursive-spinlock-thunk
+ ,spinlock)))
(sb!xc:defmacro with-recursive-system-spinlock ((spinlock &key without-gcing)
&body body)
- `(call-with-recursive-system-spinlock
- (lambda () ,@body)
- ,spinlock
- ,without-gcing))
+ `(dx-flet ((with-recursive-system-spinlock-thunk () ,@body))
+ (call-with-recursive-system-spinlock
+ #'with-recursive-system-spinlock-thunk
+ ,spinlock
+ ,without-gcing)))
(sb!xc:defmacro with-spinlock ((spinlock) &body body)
- `(call-with-spinlock
- (lambda () ,@body)
- ,spinlock))
+ `(dx-flet ((with-spinlock-thunk () ,@body))
+ (call-with-spinlock
+ #'with-spinlock-thunk
+ ,spinlock)))
;;; KLUDGE: this separate implementation for (NOT SB-THREAD) is not
;;; strictly necessary; GET-MUTEX and RELEASE-MUTEX are implemented.
(funcall function)))
#!+sb-thread
+;;; KLUDGE: These need to use DX-LET, because the cleanup form that
+;;; closes over GOT-IT causes a value-cell to be allocated for it -- and
+;;; we prefer that to go on the stack since it can.
(progn
(defun call-with-system-mutex (function mutex &optional without-gcing-p)
(declare (function function))
(flet ((%call-with-system-mutex ()
- (let (got-it)
+ (dx-let (got-it)
(unwind-protect
(when (setf got-it (get-mutex mutex))
(funcall function))
(defun call-with-recursive-system-spinlock (function lock &optional without-gcing-p)
(declare (function function))
(flet ((%call-with-system-spinlock ()
- (let ((inner-lock-p (eq *current-thread* (spinlock-value lock)))
- (got-it nil))
+ (dx-let ((inner-lock-p (eq *current-thread* (spinlock-value lock)))
+ (got-it nil))
(unwind-protect
(when (or inner-lock-p (setf got-it (get-spinlock lock)))
(funcall function))
(without-interrupts
(%call-with-system-spinlock)))))
+ (defun call-with-spinlock (function spinlock)
+ (declare (function function))
+ (dx-let ((got-it nil))
+ (without-interrupts
+ (unwind-protect
+ (when (setf got-it (allow-with-interrupts
+ (get-spinlock spinlock)))
+ (with-local-interrupts (funcall function)))
+ (when got-it
+ (release-spinlock spinlock))))))
+
(defun call-with-mutex (function mutex value waitp)
(declare (function function))
- (let ((got-it nil))
+ (dx-let ((got-it nil))
(without-interrupts
(unwind-protect
(when (setq got-it (allow-with-interrupts
(defun call-with-recursive-lock (function mutex)
(declare (function function))
- (let ((inner-lock-p (eq (mutex-value mutex) *current-thread*))
- (got-it nil))
+ (dx-let ((inner-lock-p (eq (mutex-value mutex) *current-thread*))
+ (got-it nil))
(without-interrupts
(unwind-protect
(when (or inner-lock-p (setf got-it (allow-with-interrupts
(when got-it
(release-mutex mutex))))))
- (defun call-with-spinlock (function spinlock)
- (declare (function function))
- (let ((got-it nil))
- (without-interrupts
- (unwind-protect
- (when (setf got-it (allow-with-interrupts
- (get-spinlock spinlock)))
- (with-local-interrupts (funcall function)))
- (when got-it
- (release-spinlock spinlock))))))
+
(defun call-with-recursive-spinlock (function spinlock)
(declare (function function))
- (let ((inner-lock-p (eq (spinlock-value spinlock) *current-thread*))
+ (dx-let ((inner-lock-p (eq (spinlock-value spinlock) *current-thread*))
(got-it nil))
(without-interrupts
(unwind-protect