From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Tue, 25 Mar 2008 23:39:59 +0000 (+0100)
Subject: threads: Make sure we vlc_thread_join() won't block when run from joined thread using... 
X-Git-Tag: 0.9.0-test0~1865
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8bf64ccc76a40c0ba7c2089ed5e08f58a5f405f3;p=vlc

threads: Make sure we vlc_thread_join() won't block when run from joined thread using the pthread implementation.

Signed-off-by: Rémi Denis-Courmont
---

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 23dcf71191..633e0634c2 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -834,8 +834,12 @@ void __vlc_thread_join( vlc_object_t *p_this, const char * psz_file, int i_line
     i_ret = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
 
 #elif defined( LIBVLC_USE_PTHREAD )
-    i_ret = pthread_join( p_priv->thread_id, NULL );
-
+    /* Make sure we do return if we are calling vlc_thread_join()
+     * from the joined thread */
+    if (pthread_equal (pthread_self (), p_priv->thread_id))
+        i_ret = pthread_detach (p_priv->thread_id);
+    else
+        i_ret = pthread_join (p_priv->thread_id, NULL);
 #endif
 
     if( i_ret )