projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix long-standing debug-name confusion
[sbcl.git]
/
src
/
code
/
thread.lisp
diff --git
a/src/code/thread.lisp
b/src/code/thread.lisp
index
4d6a83c
..
09c2cc4
100644
(file)
--- a/
src/code/thread.lisp
+++ b/
src/code/thread.lisp
@@
-94,8
+94,8
@@
stale value, use MUTEX-OWNER instead."
,@body))
(sb!xc:defmacro with-spinlock ((lock) &body body)
,@body))
(sb!xc:defmacro with-spinlock ((lock) &body body)
- (deprecation-warning :early "1.0.53.11" 'with-recursive-spinlock 'with-mutex)
- `(with-lock (,lock)
+ (deprecation-warning :early "1.0.53.11" 'with-spinlock 'with-mutex)
+ `(with-mutex (,lock)
,@body))
(sb!xc:defmacro without-thread-waiting-for ((&key already-without-interrupts) &body body)
,@body))
(sb!xc:defmacro without-thread-waiting-for ((&key already-without-interrupts) &body body)
@@
-118,8
+118,11
@@
stale value, use MUTEX-OWNER instead."
(setf (thread-waiting-for ,thread) nil)
(barrier (:write))
(,with (exec)))
(setf (thread-waiting-for ,thread) nil)
(barrier (:write))
(,with (exec)))
- (setf (thread-waiting-for ,thread) ,prev)
- (barrier (:write))))
+ ;; If we were waiting on a waitqueue, this becomes a bogus
+ ;; wakeup.
+ (when (mutex-p ,prev)
+ (setf (thread-waiting-for ,thread) ,prev)
+ (barrier (:write)))))
(exec)))))))
(sb!xc:defmacro with-mutex ((mutex &key (value '*current-thread*) (wait-p t))
(exec)))))))
(sb!xc:defmacro with-mutex ((mutex &key (value '*current-thread*) (wait-p t))