Changeset 7678 for branches

Timestamp:

Nov 18, 2007, 11:56:40 PM (17 years ago)

Author:

Gary Byers

Message:

WITH-LOCK-CONTEXT.

File:

• branches/working-0711/ccl/lib/macros.lisp (modified) (5 diffs)

branches/working-0711/ccl/lib/macros.lisp

@@ -2335 +2335 @@
          (free-resource ,resource-var ,var))))))
 
+;;; Bind per-thread specials which help with lock accounting.
+(defmacro with-lock-context (&body body)
+  `(let* ((*locks-held* *locks-held*)
+          (*locks-pending* *locks-pending*)
+          (*lock-conses* *lock-conses*))
+    ,@body))
+
 (defmacro with-lock-grabbed ((lock &optional
                                    (whostate "Lock"))
@@ -2341 +2348 @@
 the lock held."
   (declare (ignore whostate))
-  `(with-recursive-lock (,lock) ,@body))
+  `(with-lock-context
+    (with-recursive-lock (,lock) ,@body)))
 
 (defmacro with-lock-grabbed-maybe ((lock &optional
@@ -2347 +2355 @@
                                    &body body)
   (declare (ignore whostate))
-  `(with-recursive-lock-maybe (,lock) ,@body))
+  `(with-lock-context
+    (with-recursive-lock-maybe (,lock) ,@body)))
 
 (defmacro with-standard-abort-handling (abort-message &body body)
@@ -3012 +3021 @@
 its body with the lock held."
   (let* ((p (gensym)))
-    `(let* ((,p ,lock))
-      (unwind-protect
-           (progn
-             (read-lock-rwlock ,p)
-             ,@body)
-        (unlock-rwlock ,p)))))
+    `(with-lock-context
+      (let* ((,p ,lock))
+        (unwind-protect
+             (progn
+               (read-lock-rwlock ,p)
+               ,@body)
+          (unlock-rwlock ,p))))))
 
 
@@ -3024 +3034 @@
 its body with the lock held."
   (let* ((p (gensym)))
-    `(let* ((,p ,lock))
-      (unwind-protect
-           (progn
-             (write-lock-rwlock ,p)
-             ,@body)
-        (unlock-rwlock ,p)))))
+    `(with-lock-context
+      (let* ((,p ,lock))
+        (unwind-protect
+             (progn
+               (write-lock-rwlock ,p)
+               ,@body)
+          (unlock-rwlock ,p))))))