When rebasing the latest changes, the code for with-lock got corrupt.

This commit is contained in:
Juan Jose Garcia Ripoll 2009-09-13 20:43:40 +02:00
parent a43206af76
commit a986a152dd

View file

@ -83,7 +83,7 @@ WITHOUT-INTERRUPTS in:
(when si:*interrupts-enabled*
(si::check-pending-interrupts)))))
(defmacro with-lock ((lock &rest options) &body body)
(defmacro with-lock ((lock-form &rest options) &body body)
#-threads
`(progn ,@body)
;; Why do we need %count? Even if get-lock succeeeds, an interrupt may
@ -102,7 +102,7 @@ WITHOUT-INTERRUPTS in:
(without-interrupts
(unwind-protect
(with-restored-interrupts
(mp::get-lock ,lock, @options)
(mp::get-lock ,lock)
(locally ,@body))
(when (> (mp:lock-count ,lock) ,count)
(mp::giveup-lock ,lock)))))))