Merge pull request #1232 from TheBlueMatt/lockcontention

gmaxwell · gmaxwell · commit 92dca8097584 · 2012-05-09T03:55:02.000-07:00
Fix DEBUG_LOCKCONTENTION
diff --git a/src/util.h b/src/util.h
@@ -217,9 +217,11 @@ class CMutexLock
             {
                 printf("LOCKCONTENTION: %s\n", pszName);
                 printf("Locker: %s:%d\n", pszFile, nLine);
-            }
 #endif
             lock.lock();
+#ifdef DEBUG_LOCKCONTENTION
+            }
+#endif
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -217,9 +217,11 @@ class CMutexLock`
`217`	`217`	`{`
`218`	`218`	`printf("LOCKCONTENTION: %s\n", pszName);`
`219`	`219`	`printf("Locker: %s:%d\n", pszFile, nLine);`
`220`		`- }`
`221`	`220`	`#endif`
`222`	`221`	`lock.lock();`
	`222`	`+#ifdef DEBUG_LOCKCONTENTION`
	`223`	`+ }`
	`224`	`+#endif`
`223`	`225`	`}`
`224`	`226`	`}`
`225`	`227`