ceph-dev-[new-]setup/build/build: -DWITH_CEPH_DEBUG_MUTEX=ON for notcmalloc

Enable the debug ceph::mutex in the notcmalloc build.  The normal build
will use the defaults, which (if it's a Release or RelWithDebug build)
will not include extra debug checks.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index d82289126816db02b1ef1b10fad3c57bf7d687ef..7ed493a4cc4604b1a3bb8392932c087f7785f116 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -59,7 +59,7 @@ then
     AUTOCONF_FLAVOR_FLAGS="$AUTOCONF_FLAVOR_FLAGS --without-tcmalloc"
     CEPH_EXTRA_CONFIGURE_ARGS="--without-tcmalloc"
     CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc"
+    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON"
 else
     AUTOCONF_FLAVOR_FLAGS="$AUTOCONF_FLAVOR_FLAGS --with-tcmalloc"
     CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc"

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 37b06b696b70bff210248c293ca3140172c7aec3..74a473c10da38fc7ba22de048ddf61a7970746dd 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -54,7 +54,7 @@ then
     AUTOCONF_FLAVOR_FLAGS="$AUTOCONF_FLAVOR_FLAGS --without-tcmalloc"
     CEPH_EXTRA_CONFIGURE_ARGS="--without-tcmalloc"
     CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc"
+    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON"
 else
     AUTOCONF_FLAVOR_FLAGS="$AUTOCONF_FLAVOR_FLAGS --with-tcmalloc"
     CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc"