Don't try to lock locked mutexes under valgrind

This removes a lot of false true positives.

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 2b13262bf9097293d909adf63b051974dfb2a35f..c0bf8fdcd21dd17d312c307c95be6b65b8292951 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -357,8 +357,16 @@ void vlc_mutex_destroy (vlc_mutex_t *p_mutex)
 }
 
 #if defined(LIBVLC_USE_PTHREAD) && !defined(NDEBUG)
+# ifdef HAVE_VALGRIND_VALGRIND_H
+#  include <valgrind/valgrind.h>
+# else
+#  define RUNNING_ON_VALGRIND (0)
+# endif
+
 void vlc_assert_locked (vlc_mutex_t *p_mutex)
 {
+    if (RUNNING_ON_VALGRIND > 0)
+        return;
     assert (pthread_mutex_lock (p_mutex) == EDEADLK);
 }
 #endif