interaction: safely join the thread

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index af2f813eb78cb74f671fa2641a7db26cd2f37384..73eed932703d63f3eb3d0d9c91de6b35af56debd 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -197,6 +197,10 @@ libvlc_int_t * libvlc_InternalCreate( void )
     vlc_mutex_init( &priv->timer_lock );
     vlc_mutex_init( &priv->config_lock );
 
+    priv->threads_count = 0;
+    vlc_mutex_init (&priv->threads_lock);
+    vlc_cond_init (NULL, &priv->threads_wait);
+
     /* Store data for the non-reentrant API */
     p_static_vlc = p_libvlc;
 
@@ -895,8 +899,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
 
     /* Create a variable for showing the interface (moved from playlist). */
-    var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
-    var_SetBool( p_playlist, "intf-show", true );
+    var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
+    var_SetBool( p_libvlc, "intf-show", true );
+
+    var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
 
     /*
      * Get input filenames given as commandline arguments
@@ -958,7 +964,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
 
     /* Free interaction */
     msg_Dbg( p_libvlc, "removing interaction" );
-    vlc_object_release( priv->p_interaction );
+    interaction_Destroy( priv->p_interaction );
 
     /* Free video outputs */
     msg_Dbg( p_libvlc, "removing all video outputs" );
@@ -986,6 +992,17 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
+    /* Make sure all threads are completed before we start looking for
+     * reference leaks and deinitializing core LibVLC subsytems. */
+    vlc_mutex_lock (&priv->threads_lock);
+    while (priv->threads_count)
+    {
+        msg_Dbg (p_libvlc, "waiting for %u remaining threads",
+                 priv->threads_count);
+        vlc_cond_wait (&priv->threads_wait, &priv->threads_lock);
+    }
+    vlc_mutex_unlock (&priv->threads_lock);
+
     bool b_clean = true;
     FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
         msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
@@ -1008,9 +1025,8 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
  * termination, and destroys their structure.
  * It stops the thread systems: no instance can run after this has run
  * \param p_libvlc the instance to destroy
- * \param b_release whether we should do a release on the instance
  */
-int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
+int libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
 {
     if( !p_libvlc )
         return VLC_EGENERIC;
@@ -1066,8 +1082,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
     /* Destroy mutexes */
     vlc_mutex_destroy( &priv->config_lock );
     vlc_mutex_destroy( &priv->timer_lock );
+    vlc_cond_destroy (&priv->threads_wait);
+    vlc_mutex_destroy (&priv->threads_lock);
 
-    if( b_release ) vlc_object_release( p_libvlc );
     vlc_object_release( p_libvlc );
     p_libvlc = NULL;