Changeset 0d37c5b11c5226f990a48d4617f4b70527bb50b3

Timestamp:

05/28/08 19:22:34 (3 months ago)

Author:

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

git-committer:

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

git-parent:

[620675d9d1a3580afb6913dedd642028ee4582eb]

git-author:

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

Message:

Use a doubly-linked list for objects instead of a flat table

Speeds up object creation and deletion, slows down vlc_object_get (which
you should not use anyway, remember), makes no difference for the rest

Files:

• src/libvlc.h (modified) (2 diffs)
• src/misc/objects.c (modified) (10 diffs)

src/libvlc.h

@@ -150 +150 @@
-    /* Object structure data */
-    int                    i_counter;   ///< object counter
-    int                    i_objects;   ///< Attached objects count
-    vlc_object_t **        pp_objects;  ///< Array of all objects
-
-    module_bank_t *        p_module_bank; ///< The module bank
@@ -185 +183 @@
-    vlc_destructor_t pf_destructor;
-
+    /* Objects tree structure */
+    vlc_object_t    *prev, *next;
-    vlc_object_t   **pp_children;
-    int              i_children;

src/misc/objects.c

@@ -73 +73 @@
-static void           PrintObject   ( vlc_object_t *, const char * );
-static void           DumpStructure ( vlc_object_t *, int, char * );
-static int            FindIndex     ( vlc_object_t *, vlc_object_t **, int );
-
-static vlc_list_t   * NewList       ( int );
@@ -142 +141 @@
-
-        p_libvlc_global->i_counter = 0;
-
-
+
-        vlc_mutex_init( &structure_lock );
-    }
@@ -172 +170 @@
-    p_priv->pipes[0] = p_priv->pipes[1] = -1;
-
+    p_priv->next = VLC_OBJECT (p_libvlc_global);
-    vlc_mutex_lock( &structure_lock );
+    p_priv->prev = vlc_internals (p_libvlc_global)->prev;
+    vlc_internals (p_libvlc_global)->prev = p_new;
+    vlc_internals (p_priv->prev)->next = p_new;
-    p_new->i_object_id = p_libvlc_global->i_counter++;
-    /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
-     * useless to try and recover anything if pp_objects gets smashed. */
-    TAB_APPEND( p_libvlc_global->i_objects, p_libvlc_global->pp_objects,
-                p_new );
-    vlc_mutex_unlock( &structure_lock );
-
@@ -341 +339 @@
-        assert( p_global == vlc_global() );
-        /* Test for leaks */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            /* Dump libvlc object to ease debugging */
-            vlc_object_dump( p_this );
-
-            /* Strongly abort, cause we want these to be fixed */
-            abort();
@@ -368 +363 @@
-
-        /* We are the global object ... no need to lock. */
-        free( p_global->pp_objects );
-        p_global->pp_objects = NULL;
-
-        vlc_mutex_destroy( &structure_lock );
-    }
@@ -645 +637 @@
-void * vlc_object_get( int i_id )
-{
-    int i_max, i_middle;
-    vlc_object_t **pp_objects;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-    vlc_object_t *obj = NULL;
@@ -652 +642 @@
-    vlc_mutex_lock( &structure_lock );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }
@@ -830 +794 @@
-    if( b_should_destroy )
-    {
-the table
+object list
-         * so that it cannot be encountered by vlc_object_get() */
-
-
-
-
-
-
-
+
+
-
-        /* Detach from parent to protect against FIND_CHILDREN */
@@ -1024 +983 @@
-                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    (void)oldval; (void)p_data;
-    if( *psz_cmd == 'l' )
-    {
+        vlc_object_t *root = VLC_OBJECT (vlc_global ()), *cur = root; 
+
-        vlc_mutex_lock( &structure_lock );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        vlc_mutex_unlock( &structure_lock );
-    }
@@ -1213 +1169 @@
-/* Following functions are local */
-
-/*****************************************************************************
- * FindIndex: find the index of an object in an array of objects
- *****************************************************************************
- * This function assumes that p_this can be found in pp_objects. It will not
- * crash if p_this cannot be found, but will return a wrong value. It is your
- * duty to check the return value if you are not certain that the object could
- * be found for sure.
- *****************************************************************************/
-static int FindIndex( vlc_object_t *p_this,
-                      vlc_object_t **pp_objects, int i_count )
-{
-    int i_middle = i_count / 2;
-
-    if( i_count == 0 )
-    {
-        return 0;
-    }
-
-    if( pp_objects[i_middle] == p_this )
-    {
-        return i_middle;
-    }
-
-    if( i_count == 1 )
-    {
-        return 0;
-    }
-
-    /* We take advantage of the sorted array */
-    if( pp_objects[i_middle]->i_object_id < p_this->i_object_id )
-    {
-        return i_middle + FindIndex( p_this, pp_objects + i_middle,
-                                             i_count - i_middle );
-    }
-    else
-    {
-        return FindIndex( p_this, pp_objects, i_middle );
-    }
-}
-
-static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )
-{