Changeset 523ef308d2bff928d1246e968003a3ff429890db

Timestamp:

28/05/08 21:32:25 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[1746fdda5a2bc062d52a3b8a30d9d1d6518e64b4]

git-author:

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

Message:

The totally dumb reference checker

Files:

• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/misc/variables.c (modified) (8 diffs)

src/libvlc.h

@@ -47 +47 @@
-void vlc_threads_end( void );
-vlc_object_t *vlc_threadobj (void);
+#ifndef NDEBUG
+void vlc_refcheck (vlc_object_t *obj);
+#else
+# define vlc_refcheck( obj ) (void)0
+#endif
-
-/*

src/misc/objects.c

@@ -1470 +1470 @@
-    }
-}
+
+#ifndef NDEBUG
+void vlc_refcheck (vlc_object_t *obj)
+{
+    static unsigned errors = 0;
+    vlc_object_t *caller = vlc_threadobj ();
+    vlc_object_internals_t *priv = vlc_internals (obj);
+    int refs;
+
+    if (errors > 100)
+        return;
+
+    if (!caller)
+        return; /* main thread, not sure how to handle it */
+
+    /* An object can always access itself without reference! */
+    if (caller == obj)
+        return;
+
+    /* The calling thread is younger than the object.
+     * Access could be valid, we would need more accounting. */
+    if (caller->i_object_id > obj->i_object_id)
+        return;
+
+    vlc_spin_lock (&priv->ref_spin);
+    refs = priv->i_refcount;
+    vlc_spin_unlock (&priv->ref_spin);
+
+    /* Object has more than one reference.
+     * The current thread could be holding a valid reference. */
+    if (refs > 1)
+        return;
+
+    /* The parent of an object normally holds the unique reference.
+     * As not all objects are threads, it could also be an ancestor. */
+    vlc_mutex_lock (&structure_lock);
+    for (vlc_object_t *cur = obj; cur != NULL; cur = cur->p_parent)
+        if (cur == caller)
+        {
+            vlc_mutex_unlock (&structure_lock);
+            return;
+        }
+    vlc_mutex_unlock (&structure_lock);
+
+#if 1
+    if (caller->i_object_type == VLC_OBJECT_PLAYLIST)
+        return; /* Playlist is too clever, or hopelessly broken. */
+#endif
+    msg_Err (caller, "This thread is accessing...");
+    msg_Err (obj, "...this object in a suspicious manner.");
+
+    if (++errors == 100)
+        msg_Err (caller, "Too many reference errors");
+}
+#endif

src/misc/variables.c

@@ -169 +169 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -332 +333 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -408 +410 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -760 +763 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -837 +841 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -903 +908 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    entry.pf_callback = pf_callback;
-    entry.p_data = p_data;
@@ -940 +946 @@
-    vlc_object_internals_t *p_priv = vlc_internals( p_this );
-
+    vlc_refcheck( p_this );
-    vlc_mutex_lock( &p_priv->var_lock );
-
@@ -1576 +1583 @@
-    }
-
+    vlc_refcheck( p_this );
-    i_type = var_Type( p_obj, psz_cmd );
-    if( !( i_type&VLC_VAR_ISCOMMAND ) )