Changeset 267cd7f9b7dac986e6d2bc490f778107be95a8fc

Timestamp:

09/11/06 18:55:58 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[c6e7cf1b17ed414e1a803cdc4341d09884485e5e]

git-author:

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

Message:

- Do not attach libvlc to the global data

to avoid crashes in the messaging system (global data has no libvlc pointer)

- Rename ROOT to GLOBAL to avoid confusion (the root is LIBVLC, not GLOBAL)

Files:

• include/vlc_objects.h (modified) (1 diff)
• src/libvlc-common.c (modified) (2 diffs)
• src/misc/messages.c (modified) (2 diffs)
• src/misc/objects.c (modified) (7 diffs)
• src/misc/threads.c (modified) (1 diff)

include/vlc_objects.h

@@ -33 +33 @@
-
-/* Object types */
-ROOT  
+GLOBAL
-#define VLC_OBJECT_LIBVLC      (-2)
-#define VLC_OBJECT_MODULE      (-3)

src/libvlc-common.c

@@ -209 +209 @@
-#endif
-
-    /* Store our newly allocated structure in the global list */
-    vlc_object_attach( p_libvlc, p_libvlc_global );
-
-    /* Store data for the non-reentrant API */
-    p_static_vlc = p_libvlc;
@@ -908 +905 @@
-    vlc_mutex_destroy( &p_libvlc->config_lock );
-
-    vlc_object_detach( p_libvlc );
-    if( b_release ) vlc_object_release( p_libvlc );
-    vlc_object_destroy( p_libvlc );

src/misc/messages.c

@@ -199 +199 @@
-    switch( i_object_type )
-    {
-ROOT: return "root
+GLOBAL: return "global
-        case VLC_OBJECT_LIBVLC: return "libvlc";
-        case VLC_OBJECT_MODULE: return "module";
@@ -334 +334 @@
-    {
-        char *psz_old = NULL;
-        if( p_obj == NULL ) break;
-        if( p_obj->psz_header )
-        {

src/misc/objects.c

@@ -83 +83 @@
-static vlc_mutex_t    structure_lock;
-
-/*****************************************************************************
- * vlc_object_create: initialize a vlc object
- *****************************************************************************
- * This function allocates memory for a vlc object and initializes it. If
- * i_type is not a known value such as VLC_OBJECT_ROOT, VLC_OBJECT_VOUT and
- * so on, vlc_object_create will use its value for the object size.
- *****************************************************************************/
-
-/**
- * Initialize a vlc object
- *
- * This function allocates memory for a vlc object and initializes it. If
-ROOT
+LIBVLC
- * so on, vlc_object_create will use its value for the object size.
- */
@@ -106 +98 @@
-    switch( i_type )
-    {
-ROOT
+GLOBAL
-            i_size = sizeof(libvlc_global_data_t);
-root
+global
-            break;
-        case VLC_OBJECT_LIBVLC:
@@ -230 +222 @@
-    }
-
-ROOT
+GLOBAL
-    {
-        p_new = p_this;
@@ -267 +259 @@
-    if( !p_new->p_vars )
-    {
-ROOT
+GLOBAL
-            free( p_new );
-        return NULL;
-    }
-
-ROOT
-
-root
+GLOBAL
+
+global
-        p_new->p_libvlc_global = (libvlc_global_data_t*)p_new;
-        p_new->p_libvlc = NULL;
@@ -318 +310 @@
-    vlc_mutex_init( p_new, &p_new->var_lock );
-
-ROOT
+GLOBAL
-    {
-        vlc_mutex_init( p_new, &structure_lock );
@@ -399 +391 @@
-    if( p_this->psz_header ) free( p_this->psz_header );
-
-ROOT
-
-root
+GLOBAL
+
+global
-        free( p_this->p_libvlc_global->pp_objects );
-        p_this->p_libvlc_global->pp_objects = NULL;
@@ -427 +419 @@
-    vlc_cond_destroy( &p_this->object_wait );
-
-root
-ROOT
+global
+GLOBAL
-        free( p_this );
-}

src/misc/threads.c

@@ -118 +118 @@
-#endif
-
-ROOT
+GLOBAL
-        if( p_root == NULL )
-            i_ret = VLC_ENOMEM;