Changeset 358c28c444e3063246c6d966b0834b1078018fdf

Timestamp:

28/05/08 19:56:15 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[2e7d3d7d1581487800fbdb820e26559b5f43de15]

git-author:

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

Message:

intf_Destroy(): use vlc_object_release() and a destructor instead

While reading this, you will find a bunch of:

while (find (VLC_OBJECT_INTERFACE))

release; release;

These are of course plain BUGS (which are neither introduced nor fixed
by this commit). Imagine, for instance, what happens if two threads run
the code above at the same time... they end up releasing the interface
once too many.

Files:

• include/vlc_interface.h (modified) (1 diff)
• modules/access/vcdx/demux.c (modified) (1 diff)
• modules/codec/cmml/cmml.c (modified) (1 diff)
• modules/control/ntservice.c (modified) (2 diffs)
• modules/control/rc.c (modified) (1 diff)
• src/interface/interface.c (modified) (5 diffs)
• src/libvlc-common.c (modified) (3 diffs)
• src/libvlccore.sym (modified) (1 diff)

include/vlc_interface.h

@@ -121 +121 @@
-VLC_EXPORT( int,               intf_RunThread,  ( intf_thread_t * ) );
-VLC_EXPORT( void,              intf_StopThread, ( intf_thread_t * ) );
-VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
-
-/* If the interface is in the main thread, it should listen both to

modules/access/vcdx/demux.c

@@ -130 +130 @@
-        vlc_object_detach( p_intf );
-        vlc_object_release( p_intf );
-intf_Destroy
+vlc_object_release
-    }
-

modules/codec/cmml/cmml.c

@@ -190 +190 @@
-        vlc_object_detach( p_intf );
-        vlc_object_release( p_intf );
-intf_Destroy
+vlc_object_release
-    }
-

modules/control/ntservice.c

@@ -165 +165 @@
-        vlc_object_detach( p_extraintf );
-        vlc_object_release( p_extraintf );
-intf_Destroy
+vlc_object_release
-    }
-
@@ -333 +333 @@
-            {
-                vlc_object_detach( p_new_intf );
-intf_Destroy
+vlc_object_release
-                msg_Err( p_intf, "interface \"%s\" cannot run", psz_temp );
-            }

modules/control/rc.c

@@ -1544 +1544 @@
-        {
-            vlc_object_detach( p_newintf );
-intf_Destroy
+vlc_object_release
-        }
-    }

src/interface/interface.c

@@ -55 +55 @@
-                            vlc_value_t , vlc_value_t , void * );
-
+/**
+ * \brief Destroy the interface after the main loop endeed.
+ *
+ * \param p_intf the interface thread
+ * \return nothing
+ */
+static void intf_Destroy( vlc_object_t *obj )
+{
+    intf_thread_t *p_intf = (intf_thread_t *)obj;
+
+    /* Unlock module if present (a switch may have failed) */
+    if( p_intf->p_module )
+        module_Unneed( p_intf, p_intf->p_module );
+
+    free( p_intf->psz_intf );
+    vlc_mutex_destroy( &p_intf->change_lock );
+}
+
-/*****************************************************************************
- * intf_Create: prepare interface before main loop
@@ -115 +133 @@
-    /* Attach interface to its parent object */
-    vlc_object_attach( p_intf, p_this );
+    vlc_object_set_destructor( p_intf, intf_Destroy );
-
-    return p_intf;
@@ -141 +160 @@
-    {
-        RunInterface( p_intf );
+        vlc_object_detach( p_intf );
+        vlc_object_release( p_intf );
-        return VLC_SUCCESS;
-    }
@@ -172 +193 @@
-    }
-}
-
-/**
- * \brief Destroy the interface after the main loop endeed.
- *
- * Destroys interfaces and closes output devices
- * \param p_intf the interface thread
- * \return nothing
- */
-void intf_Destroy( intf_thread_t *p_intf )
-{
-    /* Unlock module if present (a switch may have failed) */
-    if( p_intf->p_module )
-    {
-        module_Unneed( p_intf, p_intf->p_module );
-    }
-    free( p_intf->psz_intf );
-
-    vlc_mutex_destroy( &p_intf->change_lock );
-
-    /* Free structure */
-    vlc_object_release( p_intf );
-}
-
-
-/* Following functions are local */
@@ -284 +282 @@
-    {
-        vlc_object_detach( p_intf );
-intf_Destroy
+vlc_object_release
-        return VLC_EGENERIC;
-    }

src/libvlc-common.c

@@ -937 +937 @@
-        intf_StopThread( p_intf );
-        vlc_object_detach( p_intf );
-
-
-
+
+
-    }
-
@@ -1145 +1144 @@
-    p_intf->b_play = b_play;
-    i_err = intf_RunThread( p_intf );
-|| p_intf->b_should_run_on_first_thread 
+
-    {
-        vlc_object_detach( p_intf );
-
-
+
-        return i_err;
-    }
@@ -1162 +1160 @@
-
-        vlc_object_detach( p_intf );
-intf_Destroy
+vlc_object_release
-    }
-

src/libvlccore.sym

@@ -148 +148 @@
-input_vaControl
-__intf_Create
-intf_Destroy
-__intf_Eject
-__intf_Progress