Changeset ace8caefad8be422bc4b478d4c8b2474189801f0

Timestamp:

22/06/08 14:30:30 (6 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214137830 +0300

git-parent:

[6c790747f3847ae2c88a03d6a053968143ad76e6]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214137830 +0300

Message:

LibVLC: wait until all threads are terminated

Files:

• src/libvlc.c (modified) (3 diffs)
• src/libvlc.h (modified) (2 diffs)
• src/misc/threads.c (modified) (4 diffs)

src/libvlc.c

@@ -198 +198 @@
-    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;
@@ -987 +991 @@
-#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 )
@@ -1067 +1082 @@
-    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 );

src/libvlc.h

@@ -245 +245 @@
-                                          /// (needs cleanup)
-
+    /* Singleton objects */
-    module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
-    playlist_t        *p_playlist; //< the playlist singleton
@@ -253 +254 @@
-    /* Private playlist data (FIXME - playlist_t is too public...) */
-    sout_instance_t   *p_sout; ///< kept sout instance (for playlist)
+
+    /* Thread support */
+    unsigned           threads_count;
+    vlc_mutex_t        threads_lock;
+    vlc_cond_t         threads_wait;
-} libvlc_priv_t;
-

src/misc/threads.c

@@ -468 +468 @@
-    func (obj);
-    msg_Dbg (obj, "thread ended");
+
+    libvlc_priv_t *libpriv = libvlc_priv (obj->p_libvlc);
+    vlc_mutex_lock (&libpriv->threads_lock);
+    if (--libpriv->threads_count == 0)
+        vlc_cond_signal (&libpriv->threads_wait);
+    vlc_mutex_unlock (&libpriv->threads_lock);
-    return THREAD_RVAL;
-}
@@ -483 +489 @@
-    int i_ret;
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
+    libvlc_priv_t *libpriv = libvlc_priv (p_this->p_libvlc);
-
-    struct vlc_thread_boot *boot = malloc (sizeof (*boot));
@@ -489 +496 @@
-    boot->entry = func;
-    boot->object = p_this;
+
+    vlc_mutex_lock (&libpriv->threads_lock);
+    libpriv->threads_count++;
+    vlc_mutex_unlock (&libpriv->threads_lock);
-
-    vlc_object_lock( p_this );
@@ -597 +608 @@
-
-    vlc_object_unlock( p_this );
+
+    if (i_ret)
+    {
+        vlc_mutex_lock (&libpriv->threads_lock);
+        if (--libpriv->threads_count == 0)
+            vlc_cond_signal (&libpriv->threads_wait);
+        vlc_mutex_unlock (&libpriv->threads_lock);
+    }
-    return i_ret;
-}