Revert "vlc_object_release: cleanup"

This reverts commit c85f868153145c0bd146067dfb9ac2c405f65921.

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 010d64df390d6b1bcf88dd9d415881232d0303e4..4c6547d07c4f50f9841418444f41a92fe5622e40 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -840,43 +840,54 @@ void __vlc_object_yield( vlc_object_t *p_this )
 void __vlc_object_release( vlc_object_t *p_this )
 {
     vlc_object_internals_t *internals = vlc_internals( p_this );
 void __vlc_object_release( vlc_object_t *p_this )
 {
     vlc_object_internals_t *internals = vlc_internals( p_this );

+    bool b_should_destroy;

 
     vlc_spin_lock( &internals->ref_spin );
     assert( internals->i_refcount > 0 );
 
 
     vlc_spin_lock( &internals->ref_spin );
     assert( internals->i_refcount > 0 );
 

-    if( --internals->i_refcount )
+    if( internals->i_refcount > 1 )

     {
         /* Fast path */
         /* There are still other references to the object */
     {
         /* Fast path */
         /* There are still other references to the object */

+        internals->i_refcount--;

         vlc_spin_unlock( &internals->ref_spin );
         return;
     }
     vlc_spin_unlock( &internals->ref_spin );
 
         vlc_spin_unlock( &internals->ref_spin );
         return;
     }
     vlc_spin_unlock( &internals->ref_spin );
 

-    /* Slow path : object destruction */
+    /* Slow path */

     /* Remember that we cannot hold the spin while waiting on the mutex */
     vlc_mutex_lock( &structure_lock );
     /* Remember that we cannot hold the spin while waiting on the mutex */
     vlc_mutex_lock( &structure_lock );

+    /* Take the spin again. Note that another thread may have yielded the
+     * object in the (very short) mean time. */
+    vlc_spin_lock( &internals->ref_spin );
+    b_should_destroy = --internals->i_refcount == 0;
+    vlc_spin_unlock( &internals->ref_spin );

 
 

-    /* Remove the object from the table
-     * so that it cannot be encountered by vlc_object_get() */
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-    int i_index;
-
-    i_index = FindIndex( p_this, p_libvlc_global->pp_objects,
-                         p_libvlc_global->i_objects );
-    REMOVE_ELEM( p_libvlc_global->pp_objects,
-                 p_libvlc_global->i_objects, i_index );
-
-    /* Detach from parent to protect against FIND_CHILDREN */
-    if (p_this->p_parent)
-        vlc_object_detach_unlocked (p_this);
-    /* Detach from children to protect against FIND_PARENT */
-    for (int i = 0; i < p_this->i_children; i++)
-        p_this->pp_children[i]->p_parent = NULL;
+    if( b_should_destroy )
+    {
+        /* Remove the object from the table
+         * so that it cannot be encountered by vlc_object_get() */
+        libvlc_global_data_t *p_libvlc_global = vlc_global();
+        int i_index;
+
+        i_index = FindIndex( p_this, p_libvlc_global->pp_objects,
+                             p_libvlc_global->i_objects );
+        REMOVE_ELEM( p_libvlc_global->pp_objects,
+                     p_libvlc_global->i_objects, i_index );
+
+        /* Detach from parent to protect against FIND_CHILDREN */
+        if (p_this->p_parent)
+            vlc_object_detach_unlocked (p_this);
+        /* Detach from children to protect against FIND_PARENT */
+        for (int i = 0; i < p_this->i_children; i++)
+            p_this->pp_children[i]->p_parent = NULL;
+    }

 
     vlc_mutex_unlock( &structure_lock );
 
 
     vlc_mutex_unlock( &structure_lock );
 

-    vlc_object_destroy( p_this );
+    if( b_should_destroy )
+        vlc_object_destroy( p_this );

 }
 
 /**
 }
 
 /**