From 6afdbbd7ded066f5b6e6e66e9d3b22a977adfd76 Mon Sep 17 00:00:00 2001 From: Tim Flynn Date: Sun, 11 Sep 2016 18:17:18 -0400 Subject: [PATCH 1/2] Remove -DDEBUG_LOCKORDER from debug configuration --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 56214e90697e5..c6e9db0cd7365 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,7 @@ AC_ARG_ENABLE([debug], [enable_debug=no]) if test "x$enable_debug" = xyes; then - CPPFLAGS="$CPPFLAGS -DDEBUG -DDEBUG_LOCKORDER" + CPPFLAGS="$CPPFLAGS -DDEBUG" if test "x$GCC" = xyes; then CFLAGS="$CFLAGS -g3 -O0" fi From 7b499cb4661a573f73a4e74d7612d640b4d72fb3 Mon Sep 17 00:00:00 2001 From: Tim Flynn Date: Sun, 11 Sep 2016 20:09:50 -0400 Subject: [PATCH 2/2] Updated documentation to reflect removal of -DDEBUG_LOCKORDER from debug configuration --- doc/developer-notes.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index c6945ea384352..62a4e35d699b0 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -329,8 +329,7 @@ Threads and synchronization ---------------------------- - Build and run tests with `-DDEBUG_LOCKORDER` to verify that no potential - deadlocks are introduced. As of 0.12, this is defined by default when - configuring with `--enable-debug` + deadlocks are introduced. - When using `LOCK`/`TRY_LOCK` be aware that the lock exists in the context of the current scope, so surround the statement and the code that needs the lock