Changeset e4b683171493f44387766b6c8da57070065cf290

Timestamp:

30/08/08 13:15:56 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220094956 +0300

git-parent:

[0aee55f543790ba3230ef145707b0708e2c445f9]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220094877 +0300

Message:

Resync object leak check

Files:

• src/misc/objects.c (modified) (1 diff)

src/misc/objects.c

@@ -306 +306 @@
-    free( p_this->psz_header );
-
+#ifndef NDEBUG
+    if( VLC_OBJECT(p_this->p_libvlc) == p_this )
+    {
+        /* Test for leaks */
+        vlc_object_t *leaked = p_priv->next;
+        while( leaked != p_this )
+        {
+            /* We are leaking this object */
+            fprintf( stderr,
+                     "ERROR: leaking object (id:%i, type:%s, name:%s)\n",
+                     leaked->i_object_id, leaked->psz_object_type,
+                     leaked->psz_object_name );
+            /* Dump object to ease debugging */
+            vlc_object_dump( leaked );
+            fflush(stderr);
+            leaked = vlc_internals (leaked)->next;
+        }
+
+        if( p_priv->next != p_this )
+            /* Dump libvlc object to ease debugging */
+            vlc_object_dump( p_this );
+    }
+#endif
+
-    if( p_this->p_libvlc == NULL )
-    {
-#ifndef NDEBUG
-        libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
-
-        assert( p_global == vlc_global() );
-        /* Test for leaks */
-        if (p_priv->next != p_this)
-        {
-            vlc_object_t *leaked = p_priv->next, *first = leaked;
-            do
-            {
-                /* We are leaking this object */
-                fprintf( stderr,
-                         "ERROR: leaking object (id:%i, type:%s, name:%s)\n",
-                         leaked->i_object_id, leaked->psz_object_type,
-                         leaked->psz_object_name );
-                /* Dump libvlc object to ease debugging */
-                vlc_object_dump( leaked );
-                fflush(stderr);
-                leaked = vlc_internals (leaked)->next;
-            }
-            while (leaked != first);
-
-            /* Dump global object to ease debugging */
-            vlc_object_dump( p_this );
-            /* Strongly abort, cause we want these to be fixed */
-            abort();
-        }
-#endif
-
-        /* We are the global object ... no need to lock. */
-        vlc_mutex_destroy( &structure_lock );
-    }
-
-    FREENULL( p_this->psz_object_name );