projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.24.17: grab-bag of fixes to make hpux-os smile
[sbcl.git]
/
src
/
code
/
target-thread.lisp
diff --git
a/src/code/target-thread.lisp
b/src/code/target-thread.lisp
index
c534ca0
..
3493cfc
100644
(file)
--- a/
src/code/target-thread.lisp
+++ b/
src/code/target-thread.lisp
@@
-266,8
+266,13
@@
directly."
#!-sb-thread (ignore waitp))
(unless new-owner
(setq new-owner *current-thread*))
#!-sb-thread (ignore waitp))
(unless new-owner
(setq new-owner *current-thread*))
- (when (eql new-owner (mutex-%owner mutex))
- (error "Recursive lock attempt ~S." mutex))
+ (let ((old (mutex-%owner mutex)))
+ (when (eq new-owner old)
+ (error "Recursive lock attempt ~S." mutex))
+ #!-sb-thread
+ (if old
+ (error "Strange deadlock on ~S in an unithreaded build?" mutex)
+ (setf (mutex-%owner mutex) new-owner)))
#!+sb-thread
(progn
;; FIXME: Lutexes do not currently support deadlines, as at least
#!+sb-thread
(progn
;; FIXME: Lutexes do not currently support deadlines, as at least