From 2479ed41be5ed11c56ec64df14ec389e23a29e87 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 13 Apr 2009 23:40:22 +0300
Subject: [PATCH] Don't try to lock locked mutexes under valgrind

This removes a lot of false true positives.
---
 src/misc/threads.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 2b13262bf9..c0bf8fdcd2 100644
--- 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
-- 
2.39.2