Changeset a417ec82d9a793a2681be75be9be719e4972cfce

Timestamp:

06/30/08 18:09:47 (2 months ago)

Author:

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

git-committer:

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

git-parent:

[17e4415c642051164b63dd27d65f7dc9c34ffd92]

git-author:

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

Message:

Warn in case of dangerous thread join patterns

Files:

• src/misc/objects.c (modified) (1 diff)
• src/misc/threads.c (modified) (1 diff)

src/misc/objects.c

@@ -302 +302 @@
-    /* If we are running on a thread, wait until it ends */
-    if( p_priv->b_thread )
+    {
+        msg_Warn (p_this->p_libvlc, /* do NOT use a dead object for logging! */
+                  "object %d destroyed while thread alive (VLC might crash)",
+                  p_this->i_object_id);
-        vlc_thread_join( p_this );
+    }
-
-    /* Call the custom "subclass" destructor */

src/misc/threads.c

@@ -696 +696 @@
-     * from the joined thread */
-    if (pthread_equal (pthread_self (), p_priv->thread_id))
+    {
+        msg_Warn (p_this, "joining the active thread (VLC might crash)");
-        i_ret = pthread_detach (p_priv->thread_id);
+    }
-    else
-        i_ret = pthread_join (p_priv->thread_id, NULL);