Changeset e0784be1ce6d3f6a1b34f7f3a47707e3a9887a4f

Timestamp:

30/09/07 16:01:24 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[02102ee36ffbd8d7adc243db38bd4856a29426db]

git-author:

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

Message:

Hide object reference counter.
Good news is, no plugins used it anyway.
Bad news is, some parts of libvlc still use which is wrong (i_refcount is protected by the "structure lock", meaning only misc/objects.c functions can use it safely).

Files:

• include/vlc_common.h (modified) (1 diff)
• src/control/media_instance.c (modified) (1 diff)
• src/input/vlm.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (18 diffs)
• src/osd/osd.c (modified) (2 diffs)

include/vlc_common.h

@@ -577 +577 @@
-    libvlc_int_t *p_libvlc;                  /**< (root of all evil) - 1 */ \
-                                                                            \
-    volatile int    i_refcount;                         /**< usage count */ \
-    vlc_object_t *  p_parent;                            /**< our parent */ \
-    vlc_object_t ** pp_children;                       /**< our children */ \

src/control/media_instance.c

@@ -53 +53 @@
-    vlc_object_release( p_input_thread );
-
-
+p_internals->
-
-    /* release for initial p_input_thread yield (see _new()) */

src/input/vlm.c

@@ -168 +168 @@
-    vlc_object_release( p_vlm );
-
-
+p_internals->
-    {
-        vlc_mutex_unlock( lockval.p_address );

src/libvlc.h

@@ -113 +113 @@
-
-    /* Objects management */
+    unsigned        i_refcount;
-    vlc_bool_t      b_attached;
-};

src/misc/objects.c

@@ -178 +178 @@
-    }
-
-new
+priv
-    p_new->p_parent = NULL;
-    p_new->pp_children = NULL;
@@ -359 +359 @@
-    }
-
-this->i_refcount
+priv->i_refcount > 0
-    {
-        i_delay++;
@@ -367 +367 @@
-        {
-            msg_Warn( p_this,
-i
-this
+u
+priv
-                  p_this->i_object_type );
-        }
@@ -374 +374 @@
-        {
-            msg_Err( p_this,
-i
-this
+u
+priv
-                  p_this->i_object_type );
-        }
@@ -559 +559 @@
-                {
-                    vlc_mutex_unlock( &structure_lock );
-
+p_internals->
-                    return pp_objects[i_middle+1];
-                }
@@ -568 +568 @@
-        {
-            vlc_mutex_unlock( &structure_lock );
-
+p_internals->
-            return pp_objects[i_middle];
-        }
@@ -600 +600 @@
-    if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type )
-    {
-
+p_internals->
-        vlc_mutex_unlock( &structure_lock );
-        return p_this;
@@ -653 +653 @@
-        && !strcmp( p_this->psz_object_name, psz_name ) )
-    {
-
+p_internals->
-        vlc_mutex_unlock( &structure_lock );
-        return p_this;
@@ -695 +695 @@
-{
-    vlc_mutex_lock( &structure_lock );
-
+p_internals->
-    vlc_mutex_unlock( &structure_lock );
-}
-
-
-
+
+
+
+
+
+
+
- * decrement an object refcount
- *****************************************************************************/
@@ -706 +711 @@
-{
-    vlc_mutex_lock( &structure_lock );
-p_this->i_refcount--
+Release( p_this )
-    vlc_mutex_unlock( &structure_lock );
-}
@@ -1031 +1036 @@
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
-p_list->p_values[i_index].p_object->i_refcount--
+Release( p_list->p_values[i_index].p_object )
-    }
-    vlc_mutex_unlock( &structure_lock );
@@ -1094 +1099 @@
-            if( p_tmp->i_object_type == i_type )
-            {
-
+p_internals->
-                return p_tmp;
-            }
@@ -1110 +1115 @@
-            if( p_tmp->i_object_type == i_type )
-            {
-
+p_internals->
-                return p_tmp;
-            }
@@ -1148 +1153 @@
-                && !strcmp( p_tmp->psz_object_name, psz_name ) )
-            {
-
+p_internals->
-                return p_tmp;
-            }
@@ -1165 +1170 @@
-                && !strcmp( p_tmp->psz_object_name, psz_name ) )
-            {
-
+p_internals->
-                return p_tmp;
-            }
@@ -1265 +1270 @@
-
-    psz_refcount[0] = '\0';
-
-
+
+
+
-
-    psz_thread[0] = '\0';
@@ -1365 +1371 @@
-    }
-
-
+p_internals->
-
-    p_list->p_values[i_index].p_object = p_object;
@@ -1387 +1393 @@
-    }
-
-
+p_internals->
-
-    p_list->p_values[p_list->i_count].p_object = p_object;

src/osd/osd.c

@@ -29 +29 @@
-#include <vlc_keys.h>
-#include <vlc_osd.h>
+#include "libvlc.h"
-
-#undef OSD_MENU_DEBUG
@@ -131 +132 @@
-
-    vlc_object_release( p_osd );
-
+p_internals->
-    {
-        vlc_mutex_unlock( lockval.p_address );