Changeset b187d11b4c62350735a452f6b523b642cb37b4ab

Timestamp:

05/14/08 19:15:31 (2 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210785331 +0300

git-parent:

[58a1d71baee1aac656ff54356104261d780e4a6d]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210785331 +0300

Message:

Detach dying objects atomically, so FIND_CHILDREN is safe

Files:

• src/misc/objects.c (modified) (5 diffs)

src/misc/objects.c

@@ -84 +84 @@
-
-static void vlc_object_destroy( vlc_object_t *p_this );
+static void vlc_object_detach_unlocked (vlc_object_t *p_this);
-
-/*****************************************************************************
@@ -316 +317 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
-
-
-
+
+
-
-    /* Send a kill to the object's thread if applicable */
@@ -885 +885 @@
-        REMOVE_ELEM( p_libvlc_global->pp_objects,
-                     p_libvlc_global->i_objects, i_index );
+        if (p_this->p_parent)
+            vlc_object_detach_unlocked (p_this);
-    }
-
@@ -922 +924 @@
-}
-
+
+static void vlc_object_detach_unlocked (vlc_object_t *p_this)
+{
+    assert (p_this->p_parent);
+
+    /* Climb up the tree to see whether we are connected with the root */
+    if( vlc_internals( p_this->p_parent )->b_attached )
+        SetAttachment( p_this, false );
+
+    DetachObject( p_this );
+}
+
+
-/**
- ****************************************************************************
@@ -941 +956 @@
-    }
-
-
-
-
-
-
-
-
+
-    vlc_mutex_unlock( &structure_lock );
-    p_this = NULL;
-}
-