Mercurial > hg > bitcoin

changeset 2436:31506719a493 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1232 from TheBlueMatt/lockcontention Fix DEBUG_LOCKCONTENTION
author Gregory Maxwell <gmaxwell@gmail.com>
date Wed, 09 May 2012 03:55:02 -0700
parents fe2144156828 (current diff) 9a763bdc1bcf (diff)
children c7bcb4575b3f
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/util.h
+++ b/src/util.h
@@ -217,9 +217,11 @@
             {
                 printf("LOCKCONTENTION: %s\n", pszName);
                 printf("Locker: %s:%d\n", pszFile, nLine);
+#endif
+            lock.lock();
+#ifdef DEBUG_LOCKCONTENTION
             }
 #endif
-            lock.lock();
         }
     }