Index: /branches/working-0711/ccl/level-0/l0-misc.lisp
===================================================================
--- /branches/working-0711/ccl/level-0/l0-misc.lisp	(revision 7850)
+++ /branches/working-0711/ccl/level-0/l0-misc.lisp	(revision 7851)
@@ -23,7 +23,9 @@
 
 ;; Cold-load lossage.
+#+lock-accounting
 (setq *lock-conses* (make-list 20))
 
 ;;; Per-thread consing, for lock-ownership tracking.
+#+lock-accounting
 (defun %lock-cons (x y)
   (let* ((cell (prog1 *lock-conses*
@@ -533,7 +535,10 @@
 
 (defun note-lock-wait (lock)
-  (setq *locks-pending* (%lock-cons lock *locks-pending*)))
+  #+lock-accounting
+  (setq *locks-pending* (%lock-cons lock *locks-pending*))
+  #-lock-accounting (declare (ignore lock)))
 
 (defun note-lock-held ()
+  #+lock-accounting
   (let* ((p *locks-pending*))
     (setq *locks-pending* (cdr *locks-pending*))
@@ -542,4 +547,5 @@
 
 (defun note-lock-released ()
+  #+lock-accounting
   (setf (car *locks-held*) nil
         *locks-held* (cdr *locks-held*)))
@@ -650,4 +656,5 @@
        (cond ((eql p owner)
               (incf (%get-natural ptr target::lockptr.count))
+              #+lock-accounting
               (setq *locks-held* (%lock-cons lock *locks-held*))
               (if flag (setf (lock-acquisition.status flag) t))
@@ -659,4 +666,5 @@
                   (setf (%get-ptr ptr target::lockptr.owner) p
                         (%get-natural ptr target::lockptr.count) 1)
+                  #+lock-accounting
                   (setq *locks-held* (%lock-cons lock *locks-held*))
                   (if flag (setf (lock-acquisition.status flag) t)))
@@ -678,4 +686,5 @@
      (cond ((eql (%get-object ptr target::lockptr.owner) self)
             (incf (%get-natural ptr target::lockptr.count))
+            #+lock-accounting*
             (setq *locks-held* (%lock-cons lock *locks-held*))
             (if flag (setf (lock-acquisition.status flag) t))
@@ -684,5 +693,6 @@
             (when (eql 0 (%ptr-store-conditional ptr futex-avail futex-locked))
               (%set-object ptr target::lockptr.owner self)
-              (setf (%get-natural ptr target::lockptr.count) 1)              
+              (setf (%get-natural ptr target::lockptr.count) 1)
+              #+lock-accounting
               (setq *locks-held* (%lock-cons lock *locks-held*))
               (if flag (setf (lock-acquisition.status flag) t))