Avoid dlclose() only when valgrind is running

997ae1dc · Rémi Denis-Courmont · 3ea8408d · 997ae1dc · 997ae1dc
Commit 997ae1dc authored Jan 31, 2009 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

configure.ac configure.ac +5 -1

src/modules/os.c src/modules/os.c +7 -4

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -1565,7 +1565,11 @@ AC_ARG_ENABLE(debug,
 test "${enable_debug}" != "yes" && enable_debug="no"
 AH_TEMPLATE(NDEBUG,
            [Define to 1 if debug code should NOT be compiled])
-AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)])
+AS_IF([test "x${enable_debug}" = "xno"], [
+  AC_DEFINE(NDEBUG)
+], [
+  AC_CHECK_HEADERS([valgrind/valgrind.h])
+])
 dnl
 dnl Allow runing as root (usefull for people runing on embedded platforms)

--- a/src/modules/os.c
+++ b/src/modules/os.c
@@ -65,6 +65,9 @@
 #       include <dl.h>
 #   endif
 #endif
+#ifdef HAVE_VALGRIND_VALGRIND_H
+# include <valgrind/valgrind.h>
+#endif
 /*****************************************************************************
 * Local prototypes
@@ -274,11 +277,11 @@ void module_Unload( module_handle_t handle )
    FreeLibrary( handle );
 #elif defined(HAVE_DL_DLOPEN)
-# ifdef NDEBUG
+# ifdef HAVE_VALGRIND_VALGRIND_H
-    dlclose( handle );
+    if( RUNNING_ON_VALGRIND > 0 )
-# else
+        return; /* do not dlclose() so that we get proper stack traces */
-    (void)handle;
 # endif
+    dlclose( handle );
 #elif defined(HAVE_DL_SHL_LOAD)
    shl_unload( handle );