X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc%2Fobjects.c;h=326587c4c0c5e080e89a6aed0ceab4a2123ccc4c;hb=2817b1e41d8c5ea0cfe52493751921403b3e0e13;hp=fa1bfe0281de61636a56c45be9231fa165c2b218;hpb=afccd092f45c32f72a43283c725e939f173ec3c9;p=vlc diff --git a/src/misc/objects.c b/src/misc/objects.c index fa1bfe0281..5216552f85 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -1,8 +1,7 @@ /***************************************************************************** * objects.c: vlc_object_t handling ***************************************************************************** - * Copyright (C) 2004-2007 the VideoLAN team - * $Id$ + * Copyright (C) 2004-2008 the VideoLAN team * * Authors: Samuel Hocevar * @@ -24,6 +23,9 @@ /** * \file * This file contains the functions to handle the vlc_object_t type + * + * Unless otherwise stated, functions in this file are not cancellation point. + * All functions in this file are safe w.r.t. deferred cancellation. */ @@ -34,7 +36,7 @@ # include "config.h" #endif -#include +#include #include "../libvlc.h" #include @@ -48,20 +50,10 @@ #include #include "stream_output/stream_output.h" -#include "vlc_playlist.h" #include "vlc_interface.h" #include "vlc_codec.h" #include "vlc_filter.h" -#include "vlc_httpd.h" -#include "vlc_vlm.h" -#include "input/vlm_internal.h" -#include "vlc_vod.h" -#include "vlc_tls.h" -#include "vlc_xml.h" -#include "vlc_osd.h" -#include "vlc_meta.h" - #include "variables.h" #ifndef WIN32 # include @@ -72,12 +64,6 @@ #endif #include -/***************************************************************************** - * Constants - *****************************************************************************/ - -const vlc_destructor_t kVLCDestructor = NULL; - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -86,11 +72,8 @@ static int DumpCommand( vlc_object_t *, char const *, static vlc_object_t * FindObject ( vlc_object_t *, int, int ); static vlc_object_t * FindObjectName( vlc_object_t *, const char *, int ); -static void DetachObject ( vlc_object_t * ); 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 void SetAttachment ( vlc_object_t *, vlc_bool_t ); static vlc_list_t * NewList ( int ); static void ListReplace ( vlc_list_t *, vlc_object_t *, int ); @@ -99,133 +82,114 @@ static int CountChildren ( vlc_object_t *, int ); static void ListChildren ( vlc_list_t *, vlc_object_t *, int ); static void vlc_object_destroy( vlc_object_t *p_this ); -static void vlc_object_yield_locked( vlc_object_t *p_this ); +static void vlc_object_detach_unlocked (vlc_object_t *p_this); +static void vlc_object_dump( vlc_object_t *p_this ); /***************************************************************************** * Local structure lock *****************************************************************************/ -static vlc_mutex_t structure_lock; -static vlc_object_internals_t global_internals; +static vlc_mutex_t structure_lock; -vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size, - int i_type, const char *psz_type ) +static void close_nocancel (int fd) +{ + int canc = vlc_savecancel (); + close (fd); + vlc_restorecancel (canc); +} + +void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, + int i_type, const char *psz_type ) { vlc_object_t *p_new; vlc_object_internals_t *p_priv; - if( i_type == VLC_OBJECT_GLOBAL ) - { - p_new = p_this; - p_priv = &global_internals; - memset( p_priv, 0, sizeof( *p_priv ) ); - } - else - { - p_priv = calloc( 1, sizeof( *p_priv ) + i_size ); - if( p_priv == NULL ) - return NULL; + /* NOTE: + * VLC objects are laid out as follow: + * - first the LibVLC-private per-object data, + * - then VLC_COMMON members from vlc_object_t, + * - finally, the type-specific data (if any). + * + * This function initializes the LibVLC and common data, + * and zeroes the rest. + */ + p_priv = calloc( 1, sizeof( *p_priv ) + i_size ); + if( p_priv == NULL ) + return NULL; - p_new = (vlc_object_t *)(p_priv + 1); - } + assert (i_size >= sizeof (vlc_object_t)); + p_new = (vlc_object_t *)(p_priv + 1); - p_new->p_internals = p_priv; p_new->i_object_type = i_type; p_new->psz_object_type = psz_type; - p_new->psz_object_name = NULL; - p_new->b_die = VLC_FALSE; - p_new->b_error = VLC_FALSE; - p_new->b_dead = VLC_FALSE; - p_priv->b_attached = VLC_FALSE; - p_new->b_force = VLC_FALSE; + p_new->b_die = false; + p_new->b_error = false; + p_new->b_force = false; p_new->psz_header = NULL; - if( p_this->i_flags & OBJECT_FLAGS_NODBG ) - p_new->i_flags |= OBJECT_FLAGS_NODBG; - if( p_this->i_flags & OBJECT_FLAGS_QUIET ) - p_new->i_flags |= OBJECT_FLAGS_QUIET; - if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) - p_new->i_flags |= OBJECT_FLAGS_NOINTERACT; + if (p_this) + p_new->i_flags = p_this->i_flags + & (OBJECT_FLAGS_NODBG|OBJECT_FLAGS_QUIET|OBJECT_FLAGS_NOINTERACT); p_priv->p_vars = calloc( sizeof( variable_t ), 16 ); if( !p_priv->p_vars ) { - if( i_type != VLC_OBJECT_GLOBAL ) - free( p_priv ); + free( p_priv ); return NULL; } - if( i_type == VLC_OBJECT_GLOBAL ) + if( p_this == NULL ) { - /* If i_type is global, then p_new is actually p_libvlc_global */ - libvlc_global_data_t *p_libvlc_global = (libvlc_global_data_t *)p_new; - p_new->p_libvlc = NULL; - - p_libvlc_global->i_counter = 0; - p_new->i_object_id = 0; - - p_libvlc_global->i_objects = 1; - p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) ); - p_libvlc_global->pp_objects[0] = p_new; - p_priv->b_attached = VLC_TRUE; - } - else - { - libvlc_global_data_t *p_libvlc_global = vlc_global(); if( i_type == VLC_OBJECT_LIBVLC ) - { p_new->p_libvlc = (libvlc_int_t*)p_new; - p_priv->b_attached = VLC_TRUE; - } else { - p_new->p_libvlc = p_this->p_libvlc; + p_new->p_libvlc = NULL; + vlc_mutex_init( &structure_lock ); } - vlc_mutex_lock( &structure_lock ); - - p_libvlc_global->i_counter++; - 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 ); + p_this = p_priv->next = p_priv->prev = p_new; } + else + p_new->p_libvlc = p_this->p_libvlc; + vlc_spin_init( &p_priv->ref_spin ); p_priv->i_refcount = 1; - p_priv->pf_destructor = kVLCDestructor; + p_priv->pf_destructor = NULL; + p_priv->b_thread = false; p_new->p_parent = NULL; - p_new->pp_children = NULL; - p_new->i_children = 0; + p_priv->pp_children = NULL; + p_priv->i_children = 0; p_new->p_private = NULL; /* Initialize mutexes and condvars */ - vlc_mutex_init( p_new, &p_new->object_lock ); - vlc_cond_init( p_new, &p_new->object_wait ); - vlc_mutex_init( p_new, &p_priv->var_lock ); + vlc_mutex_init( &p_priv->lock ); + vlc_cond_init( &p_priv->wait ); + vlc_mutex_init( &p_priv->var_lock ); vlc_spin_init( &p_priv->spin ); p_priv->pipes[0] = p_priv->pipes[1] = -1; - if( i_type == VLC_OBJECT_GLOBAL ) - { - vlc_mutex_init( p_new, &structure_lock ); - } + p_priv->next = p_this; + vlc_mutex_lock( &structure_lock ); + p_priv->prev = vlc_internals (p_this)->prev; + vlc_internals (p_this)->prev = p_new; + vlc_internals (p_priv->prev)->next = p_new; + vlc_mutex_unlock( &structure_lock ); if( i_type == VLC_OBJECT_LIBVLC ) { + int canc = vlc_savecancel (); var_Create( p_new, "list", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); var_AddCallback( p_new, "list", DumpCommand, NULL ); var_Create( p_new, "tree", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); var_AddCallback( p_new, "tree", DumpCommand, NULL ); var_Create( p_new, "vars", VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); var_AddCallback( p_new, "vars", DumpCommand, NULL ); + vlc_restorecancel (canc); } return p_new; @@ -247,42 +211,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) switch( i_type ) { - case VLC_OBJECT_GLOBAL: - i_size = sizeof(libvlc_global_data_t); - psz_type = "global"; - break; - case VLC_OBJECT_LIBVLC: - i_size = sizeof(libvlc_int_t); - psz_type = "libvlc"; - break; case VLC_OBJECT_INTF: i_size = sizeof(intf_thread_t); psz_type = "interface"; break; - case VLC_OBJECT_DIALOGS: - i_size = sizeof(intf_thread_t); - psz_type = "dialogs"; - break; - case VLC_OBJECT_PLAYLIST: - i_size = sizeof(playlist_t); - psz_type = "playlist"; - break; - case VLC_OBJECT_SD: - i_size = sizeof(services_discovery_t); - psz_type = "services discovery"; - break; - case VLC_OBJECT_INPUT: - i_size = sizeof(input_thread_t); - psz_type = "input"; - break; - case VLC_OBJECT_DEMUX: - i_size = sizeof(demux_t); - psz_type = "demux"; - break; - case VLC_OBJECT_ACCESS: - i_size = sizeof(access_t); - psz_type = "access"; - break; case VLC_OBJECT_DECODER: i_size = sizeof(decoder_t); psz_type = "decoder"; @@ -295,61 +227,17 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) i_size = sizeof(encoder_t); psz_type = "encoder"; break; - case VLC_OBJECT_FILTER: - i_size = sizeof(filter_t); - psz_type = "filter"; - break; - case VLC_OBJECT_VOUT: - i_size = sizeof(vout_thread_t); - psz_type = "video output"; - break; - case VLC_OBJECT_SPU: - i_size = sizeof(spu_t); - psz_type = "subpicture"; - break; case VLC_OBJECT_AOUT: i_size = sizeof(aout_instance_t); psz_type = "audio output"; break; - case VLC_OBJECT_SOUT: - i_size = sizeof(sout_instance_t); - psz_type = "stream output"; - break; - case VLC_OBJECT_VLM: - i_size = sizeof( vlm_t ); - psz_type = "vlm dameon"; - break; - case VLC_OBJECT_VOD: - i_size = sizeof( vod_t ); - psz_type = "vod server"; - break; - case VLC_OBJECT_XML: - i_size = sizeof( xml_t ); - psz_type = "xml"; - break; case VLC_OBJECT_OPENGL: i_size = sizeof( vout_thread_t ); psz_type = "opengl"; break; - case VLC_OBJECT_ANNOUNCE: - i_size = sizeof( announce_handler_t ); - psz_type = "announce"; - break; - case VLC_OBJECT_META_ENGINE: - i_size = sizeof( meta_engine_t ); - psz_type = "meta engine"; - break; - case VLC_OBJECT_OSDMENU: - i_size = sizeof( osd_menu_t ); - psz_type = "osd menu"; - break; - case VLC_OBJECT_INTERACTION: - i_size = sizeof( interaction_t ); - psz_type = "interaction"; - break; default: - i_size = i_type > (int)sizeof(vlc_object_t) - ? i_type : (int)sizeof(vlc_object_t); + assert( i_type > 0 ); /* unknown type?! */ + i_size = i_type; i_type = VLC_OBJECT_GENERIC; psz_type = "generic"; break; @@ -371,10 +259,7 @@ void __vlc_object_set_destructor( vlc_object_t *p_this, vlc_destructor_t pf_destructor ) { vlc_object_internals_t *p_priv = vlc_internals(p_this ); - - vlc_mutex_lock( &structure_lock ); p_priv->pf_destructor = pf_destructor; - vlc_mutex_unlock( &structure_lock ); } /** @@ -384,41 +269,25 @@ void __vlc_object_set_destructor( vlc_object_t *p_this, * This function destroys an object that has been previously allocated with * vlc_object_create. The object's refcount must be zero and it must not be * attached to other objects in any way. + * + * This function must be called with cancellation disabled (currently). *****************************************************************************/ static void vlc_object_destroy( vlc_object_t *p_this ) { vlc_object_internals_t *p_priv = vlc_internals( p_this ); - /* Automatically detach the object from its parents */ - if( p_this->p_parent ) vlc_object_detach( p_this ); - - /* Sanity checks */ - if( p_this->i_children ) - { - int i; + /* Objects are always detached beforehand */ + assert( !p_this->p_parent ); - fprintf( stderr, - "ERROR: cannot delete object (%i, %s) with %d children\n", - p_this->i_object_id, p_this->psz_object_name, - p_this->i_children ); - - for( i = 0; i < p_this->i_children; i++ ) - { - fprintf( stderr, - "ERROR: Remaining children object " - "(id:%i, type:%s, name:%s)\n", - p_this->pp_children[i]->i_object_id, - p_this->pp_children[i]->psz_object_type, - p_this->pp_children[i]->psz_object_name ); - } - fflush(stderr); - abort(); - } + /* Send a kill to the object's thread if applicable */ + vlc_object_kill( p_this ); /* Call the custom "subclass" destructor */ if( p_priv->pf_destructor ) p_priv->pf_destructor( p_this ); + /* Any thread must have been cleaned up at this point. */ + assert( !p_priv->b_thread ); /* Destroy the associated variables, starting from the end so that * no memmove calls have to be done. */ @@ -432,52 +301,22 @@ static void vlc_object_destroy( vlc_object_t *p_this ) free( p_this->psz_header ); - if( p_this->i_object_type == VLC_OBJECT_GLOBAL ) - { - libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this; - - /* Test for leaks */ - if( p_global->i_objects > 0 ) - { - int i; - for( i = 0; i < p_global->i_objects; i++ ) - { - /* We are leaking this object */ - fprintf( stderr, - "ERROR: leaking object (id:%i, type:%s, name:%s)\n", - p_global->pp_objects[i]->i_object_id, - p_global->pp_objects[i]->psz_object_type, - p_global->pp_objects[i]->psz_object_name ); - fflush(stderr); - } - /* Strongly abort, cause we want these to be fixed */ - abort(); - } - + if( p_this->p_libvlc == NULL ) /* We are the global object ... no need to lock. */ - free( p_global->pp_objects ); - p_global->pp_objects = NULL; - vlc_mutex_destroy( &structure_lock ); - } -#if defined(WIN32) || defined(UNDER_CE) - /* if object has an associated thread, close it now */ - if( p_priv->thread_id.hThread ) - CloseHandle(p_priv->thread_id.hThread); -#endif + FREENULL( p_this->psz_object_name ); - vlc_mutex_destroy( &p_this->object_lock ); - vlc_cond_destroy( &p_this->object_wait ); + vlc_spin_destroy( &p_priv->ref_spin ); + vlc_mutex_destroy( &p_priv->lock ); + vlc_cond_destroy( &p_priv->wait ); vlc_spin_destroy( &p_priv->spin ); if( p_priv->pipes[1] != -1 ) close( p_priv->pipes[1] ); if( p_priv->pipes[0] != -1 ) close( p_priv->pipes[0] ); - /* global is not dynamically allocated by vlc_object_create */ - if( p_this->i_object_type != VLC_OBJECT_GLOBAL ) - free( p_priv ); + free( p_priv ); } @@ -485,13 +324,13 @@ static void vlc_object_destroy( vlc_object_t *p_this ) void __vlc_object_lock( vlc_object_t *obj ) { - vlc_mutex_lock( &obj->object_lock ); + vlc_mutex_lock( &(vlc_internals(obj)->lock) ); } void __vlc_object_unlock( vlc_object_t *obj ) { - vlc_assert_locked( &obj->object_lock ); - vlc_mutex_unlock( &obj->object_lock ); + vlc_assert_locked( &(vlc_internals(obj)->lock) ); + vlc_mutex_unlock( &(vlc_internals(obj)->lock) ); } #ifdef WIN32 @@ -562,8 +401,8 @@ error: int __vlc_object_waitpipe( vlc_object_t *obj ) { int pfd[2] = { -1, -1 }; - struct vlc_object_internals_t *internals = obj->p_internals; - vlc_bool_t killed = VLC_FALSE; + vlc_object_internals_t *internals = vlc_internals( obj ); + bool killed = false; vlc_spin_lock (&internals->spin); if (internals->pipes[0] == -1) @@ -612,79 +451,34 @@ int __vlc_object_waitpipe( vlc_object_t *obj ) /** - * Waits for the object to be signaled (using vlc_object_signal()). - * If the object already has a signal pending, this function will return - * immediately. It is asserted that the caller holds the object lock. + * Suspends until another thread calls vlc_object_signal_unlocked(). + * The thread may be woken up earlier due to limitations of the underlying + * implementation. * - * @return true if the object is dying and should terminate. - */ -vlc_bool_t __vlc_object_wait( vlc_object_t *obj ) -{ - vlc_assert_locked( &obj->object_lock ); - vlc_cond_wait( &obj->object_wait, &obj->object_lock ); - return obj->b_die; -} - - -/** - * Waits for the object to be signaled (using vlc_object_signal()), or for - * a timer to expire. - * If the object already has a signal pending, this function will return - * immediately. It is asserted that the caller holds the object lock. + * In new code, please use vlc_cond_wait() instead. * - * @return negative if the object is dying and should terminate, - * positive if the the object has been signaled but is not dying, - * 0 if timeout has been reached. + * This function is a cancellation point. In case of cancellation, the object + * will be in locked state. */ -int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline ) +void __vlc_object_wait( vlc_object_t *obj ) { - int v; - - vlc_assert_locked( &obj->object_lock ); - v = vlc_cond_timedwait( &obj->object_wait, &obj->object_lock, deadline ); - if( v == 0 ) /* signaled */ - return obj->b_die ? -1 : 1; - return 0; + vlc_object_internals_t *priv = vlc_internals( obj ); + vlc_assert_locked( &priv->lock); + vlc_cond_wait( &priv->wait, &priv->lock ); } /** - * Checks whether an object has been "killed". - * The object lock must be held. - * - * Typical code for an object thread could be: - * - vlc_object_lock (self); - ...initialization... - while (vlc_object_alive (self)) - { - ...preprocessing... - - if (vlc_object_wait (self)) - continue; - - ...postprocessing... - } - ...deinitialization... - vlc_object_unlock (self); + * Wakes up one thread waiting on the object. If no thread are (yet) waiting, + * nothing happens. * - * - * @return true iff the object has not been killed yet - */ -vlc_bool_t __vlc_object_alive( vlc_object_t *obj ) -{ - vlc_assert_locked( &obj->object_lock ); - return !obj->b_die; -} - - -/** - * Signals an object for which the lock is held. + * Please do not use this function in new code as we are trying to untangle + * objects and threads. Use vlc_cond_wait() instead. */ void __vlc_object_signal_unlocked( vlc_object_t *obj ) { - vlc_assert_locked (&obj->object_lock); - vlc_cond_signal( &obj->object_wait ); + vlc_assert_locked (&(vlc_internals(obj)->lock)); + vlc_cond_signal( &(vlc_internals(obj)->wait) ); } @@ -694,97 +488,31 @@ void __vlc_object_signal_unlocked( vlc_object_t *obj ) */ void __vlc_object_kill( vlc_object_t *p_this ) { - struct vlc_object_internals_t *internals = p_this->p_internals; + vlc_object_internals_t *priv = vlc_internals( p_this ); int fd; - vlc_mutex_lock( &p_this->object_lock ); - p_this->b_die = VLC_TRUE; + vlc_thread_cancel( p_this ); + vlc_object_lock( p_this ); + p_this->b_die = true; - vlc_spin_lock (&internals->spin); - fd = internals->pipes[1]; - internals->pipes[1] = -1; - vlc_spin_unlock (&internals->spin); + vlc_spin_lock (&priv->spin); + fd = priv->pipes[1]; + priv->pipes[1] = -1; + vlc_spin_unlock (&priv->spin); if( fd != -1 ) { msg_Dbg (p_this, "waitpipe: object killed"); - close (fd); + close_nocancel (fd); } - if( p_this->i_object_type == VLC_OBJECT_LIBVLC ) - for( int i = 0; i < p_this->i_children ; i++ ) - vlc_object_kill( p_this->pp_children[i] ); - - vlc_object_signal_unlocked( p_this ); - vlc_mutex_unlock( &p_this->object_lock ); + vlc_cond_broadcast (&priv->wait); + /* This also serves as a memory barrier toward vlc_object_alive(): */ + vlc_object_unlock( p_this ); } -/** - * find an object given its ID - * - * This function looks for the object whose i_object_id field is i_id. We - * use a dichotomy so that lookups are in log2(n). - *****************************************************************************/ -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_mutex_lock( &structure_lock ); - - pp_objects = p_libvlc_global->pp_objects; - - /* Perform our dichotomy */ - for( i_max = p_libvlc_global->i_objects - 1 ; ; ) - { - i_middle = i_max / 2; - - if( pp_objects[i_middle]->i_object_id > i_id ) - { - i_max = i_middle; - } - else if( pp_objects[i_middle]->i_object_id < i_id ) - { - if( i_middle ) - { - pp_objects += i_middle; - i_max -= i_middle; - } - else - { - /* This happens when there are only two remaining objects */ - if( pp_objects[i_middle+1]->i_object_id == i_id ) - { - vlc_object_yield_locked( pp_objects[i_middle+1] ); - vlc_mutex_unlock( &structure_lock ); - return pp_objects[i_middle+1]; - } - break; - } - } - else - { - vlc_object_yield_locked( pp_objects[i_middle] ); - vlc_mutex_unlock( &structure_lock ); - return pp_objects[i_middle]; - } - - if( i_max == 0 ) - { - /* this means that i_max == i_middle, and since we have already - * tested pp_objects[i_middle]), p_found is properly set. */ - break; - } - } - - vlc_mutex_unlock( &structure_lock ); - return NULL; -} - -/** - **************************************************************************** +/***************************************************************************** * find a typed object and increment its refcount ***************************************************************************** * This function recursively looks for a given object type. i_mode can be one @@ -794,75 +522,64 @@ void * __vlc_object_find( vlc_object_t *p_this, int i_type, int i_mode ) { vlc_object_t *p_found; - vlc_mutex_lock( &structure_lock ); - - /* Avoid obvious freed object uses */ - assert( p_this->p_internals->i_refcount > 0 ); - /* If we are of the requested type ourselves, don't look further */ if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type ) { - vlc_object_yield_locked( p_this ); - vlc_mutex_unlock( &structure_lock ); + vlc_object_yield( p_this ); return p_this; } /* Otherwise, recursively look for the object */ - if( (i_mode & 0x000f) == FIND_ANYWHERE ) - { - vlc_object_t *p_root = p_this; - - /* Find the root */ - while( p_root->p_parent != NULL && - p_root != VLC_OBJECT( p_this->p_libvlc ) ) - { - p_root = p_root->p_parent; - } - - p_found = FindObject( p_root, i_type, (i_mode & ~0x000f)|FIND_CHILD ); - if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_libvlc ) ) - { - p_found = FindObject( VLC_OBJECT( p_this->p_libvlc ), - i_type, (i_mode & ~0x000f)|FIND_CHILD ); - } - } - else + if ((i_mode & 0x000f) == FIND_ANYWHERE) { - p_found = FindObject( p_this, i_type, i_mode ); +#ifndef NDEBUG + if (i_type == VLC_OBJECT_PLAYLIST) + msg_Err (p_this, "using vlc_object_find(VLC_OBJECT_PLAYLIST) " + "instead of pl_Yield()"); +#endif + return vlc_object_find (p_this->p_libvlc, i_type, + (i_mode & ~0x000f)|FIND_CHILD); } + vlc_mutex_lock( &structure_lock ); + p_found = FindObject( p_this, i_type, i_mode ); vlc_mutex_unlock( &structure_lock ); - return p_found; } +#undef vlc_object_find_name /** - **************************************************************************** - * find a named object and increment its refcount - ***************************************************************************** - * This function recursively looks for a given object name. i_mode can be one - * of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE. - *****************************************************************************/ -void * __vlc_object_find_name( vlc_object_t *p_this, const char *psz_name, - int i_mode ) + * Finds a named object and increment its reference count. + * Beware that objects found in this manner can be "owned" by another thread, + * be of _any_ type, and be attached to any module (if any). With such an + * object reference, you can set or get object variables, emit log messages, + * and read write-once object parameters (psz_object_type, etc). + * You CANNOT cast the object to a more specific object type, and you + * definitely cannot invoke object type-specific callbacks with this. + * + * @param p_this object to search from + * @param psz_name name of the object to search for + * @param i_mode search direction: FIND_PARENT, FIND_CHILD or FIND_ANYWHERE. + * + * @return a matching object (must be released by the caller), + * or NULL on error. + */ +vlc_object_t *vlc_object_find_name( vlc_object_t *p_this, + const char *psz_name, int i_mode ) { vlc_object_t *p_found; - vlc_mutex_lock( &structure_lock ); - - /* Avoid obvious freed object uses */ - assert( p_this->p_internals->i_refcount > 0 ); - /* If have the requested name ourselves, don't look further */ if( !(i_mode & FIND_STRICT) && p_this->psz_object_name && !strcmp( p_this->psz_object_name, psz_name ) ) { - vlc_object_yield_locked( p_this ); - vlc_mutex_unlock( &structure_lock ); + vlc_object_yield( p_this ); return p_this; } + vlc_mutex_lock( &structure_lock ); + /* Otherwise, recursively look for the object */ if( (i_mode & 0x000f) == FIND_ANYWHERE ) { @@ -894,64 +611,101 @@ void * __vlc_object_find_name( vlc_object_t *p_this, const char *psz_name, } /** - **************************************************************************** - * increment an object refcount - *****************************************************************************/ - -/* When the structure_lock is locked */ -static void vlc_object_yield_locked( vlc_object_t *p_this ) + * Increment an object reference counter. + */ +void __vlc_object_yield( vlc_object_t *p_this ) { - vlc_assert_locked (&structure_lock); + vlc_object_internals_t *internals = vlc_internals( p_this ); + vlc_spin_lock( &internals->ref_spin ); /* Avoid obvious freed object uses */ - assert( p_this->p_internals->i_refcount > 0 ); - + assert( internals->i_refcount > 0 ); /* Increment the counter */ - p_this->p_internals->i_refcount++; -} - -/* Public function */ -void __vlc_object_yield( vlc_object_t *p_this ) -{ - vlc_mutex_lock( &structure_lock ); - vlc_object_yield_locked( p_this ); - vlc_mutex_unlock( &structure_lock ); + internals->i_refcount++; + vlc_spin_unlock( &internals->ref_spin ); } - /***************************************************************************** - * decrement an object refcount + * Decrement an object refcount * And destroy the object if its refcount reach zero. *****************************************************************************/ void __vlc_object_release( vlc_object_t *p_this ) { - vlc_bool_t b_should_destroy; + vlc_object_internals_t *internals = vlc_internals( p_this ); + bool b_should_destroy; - vlc_mutex_lock( &structure_lock ); + vlc_spin_lock( &internals->ref_spin ); + assert( internals->i_refcount > 0 ); - assert( p_this->p_internals->i_refcount > 0 ); - p_this->p_internals->i_refcount--; - b_should_destroy = (p_this->p_internals->i_refcount == 0); + if( internals->i_refcount > 1 ) + { + /* Fast path */ + /* There are still other references to the object */ + internals->i_refcount--; + vlc_spin_unlock( &internals->ref_spin ); + return; + } + vlc_spin_unlock( &internals->ref_spin ); + + /* Slow path */ + /* Remember that we cannot hold the spin while waiting on the mutex */ + vlc_mutex_lock( &structure_lock ); + /* Take the spin again. Note that another thread may have yielded the + * object in the (very short) mean time. */ + vlc_spin_lock( &internals->ref_spin ); + b_should_destroy = --internals->i_refcount == 0; + vlc_spin_unlock( &internals->ref_spin ); if( b_should_destroy ) { - /* Make sure this object can't be obtained via vlc_find_object now that - * it is freed */ - libvlc_global_data_t *p_libvlc_global = vlc_global(); - int i_index; - - /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's - * useless to try and recover anything if pp_objects gets smashed. */ - i_index = FindIndex( p_this, p_libvlc_global->pp_objects, - p_libvlc_global->i_objects ); - REMOVE_ELEM( p_libvlc_global->pp_objects, - p_libvlc_global->i_objects, i_index ); +#ifndef NDEBUG + if( VLC_OBJECT(p_this->p_libvlc) == p_this ) + { + /* Test for leaks */ + vlc_object_t *leaked = internals->next; + while( leaked != p_this ) + { + /* We are leaking this object */ + fprintf( stderr, + "ERROR: leaking object (%p, type:%s, name:%s)\n", + leaked, 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( internals->next != p_this ) + /* Dump libvlc object to ease debugging */ + vlc_object_dump( p_this ); + } +#endif + /* Remove the object from object list + * so that it cannot be encountered by vlc_object_get() */ + vlc_internals (internals->next)->prev = internals->prev; + vlc_internals (internals->prev)->next = internals->next; + + /* Detach from parent to protect against FIND_CHILDREN */ + vlc_object_detach_unlocked (p_this); + /* Detach from children to protect against FIND_PARENT */ + for (int i = 0; i < internals->i_children; i++) + internals->pp_children[i]->p_parent = NULL; } vlc_mutex_unlock( &structure_lock ); if( b_should_destroy ) + { + int canc; + + free( internals->pp_children ); + internals->pp_children = NULL; + internals->i_children = 0; + canc = vlc_savecancel (); vlc_object_destroy( p_this ); + vlc_restorecancel (canc); + } } /** @@ -967,25 +721,61 @@ void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent ) vlc_mutex_lock( &structure_lock ); - /* Avoid obvious freed object uses */ - assert( p_this->p_internals->i_refcount > 0 ); - /* Attach the parent to its child */ + assert (!p_this->p_parent); p_this->p_parent = p_parent; /* Attach the child to its parent */ - INSERT_ELEM( p_parent->pp_children, p_parent->i_children, - p_parent->i_children, p_this ); + vlc_object_internals_t *priv = vlc_internals( p_parent ); + INSERT_ELEM( priv->pp_children, priv->i_children, priv->i_children, + p_this ); + + vlc_mutex_unlock( &structure_lock ); +} - /* Climb up the tree to see whether we are connected with the root */ - if( p_parent->p_internals->b_attached ) + +static void vlc_object_detach_unlocked (vlc_object_t *p_this) +{ + vlc_assert_locked (&structure_lock); + + if (p_this->p_parent == NULL) + return; + + vlc_object_internals_t *priv = vlc_internals( p_this->p_parent ); + + int i_index, i; + + /* Remove p_this's parent */ + p_this->p_parent = NULL; + + /* Remove all of p_parent's children which are p_this */ + for( i_index = priv->i_children ; i_index-- ; ) { - SetAttachment( p_this, VLC_TRUE ); + if( priv->pp_children[i_index] == p_this ) + { + priv->i_children--; + for( i = i_index ; i < priv->i_children ; i++ ) + priv->pp_children[i] = priv->pp_children[i+1]; + } } - vlc_mutex_unlock( &structure_lock ); + if( priv->i_children ) + { + vlc_object_t **pp_children = (vlc_object_t **) + realloc( priv->pp_children, + priv->i_children * sizeof(vlc_object_t *) ); + if( pp_children ) + priv->pp_children = pp_children; + } + else + { + /* Special case - don't realloc() to zero to avoid leaking */ + free( priv->pp_children ); + priv->pp_children = NULL; + } } + /** **************************************************************************** * detach object from its parent @@ -997,25 +787,14 @@ void __vlc_object_detach( vlc_object_t *p_this ) if( !p_this ) return; vlc_mutex_lock( &structure_lock ); - if( !p_this->p_parent ) - { msg_Err( p_this, "object is not attached" ); - vlc_mutex_unlock( &structure_lock ); - return; - } - - /* Climb up the tree to see whether we are connected with the root */ - if( p_this->p_parent->p_internals->b_attached ) - { - SetAttachment( p_this, VLC_FALSE ); - } - - DetachObject( p_this ); + else + vlc_object_detach_unlocked( p_this ); vlc_mutex_unlock( &structure_lock ); - p_this = NULL; } + /** **************************************************************************** * find a list typed objects and increment their refcount @@ -1026,52 +805,29 @@ void __vlc_object_detach( vlc_object_t *p_this ) vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) { vlc_list_t *p_list; - vlc_object_t **pp_current, **pp_end; - int i_count = 0, i_index = 0; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - - vlc_mutex_lock( &structure_lock ); - - /* Avoid obvious freed object uses */ - assert( p_this->p_internals->i_refcount > 0 ); + int i_count = 0; /* Look for the objects */ switch( i_mode & 0x000f ) { case FIND_ANYWHERE: - pp_current = p_libvlc_global->pp_objects; - pp_end = pp_current + p_libvlc_global->i_objects; - - for( ; pp_current < pp_end ; pp_current++ ) - { - if( (*pp_current)->p_internals->b_attached - && (*pp_current)->i_object_type == i_type ) - { - i_count++; - } - } - - p_list = NewList( i_count ); - pp_current = p_libvlc_global->pp_objects; - - for( ; pp_current < pp_end ; pp_current++ ) - { - if( (*pp_current)->p_internals->b_attached - && (*pp_current)->i_object_type == i_type ) - { - ListReplace( p_list, *pp_current, i_index ); - if( i_index < i_count ) i_index++; - } - } - break; + /* Modules should probably not be object, and the module should perhaps + * not be shared across LibVLC instances. In the mean time, this ugly + * hack is brought to you by Courmisch. */ + if (i_type == VLC_OBJECT_MODULE) + return vlc_list_find ((vlc_object_t *)p_module_bank, + i_type, FIND_CHILD); + return vlc_list_find (p_this->p_libvlc, i_type, FIND_CHILD); case FIND_CHILD: + vlc_mutex_lock( &structure_lock ); i_count = CountChildren( p_this, i_type ); p_list = NewList( i_count ); /* Check allocation was successful */ if( p_list->i_count != i_count ) { + vlc_mutex_unlock( &structure_lock ); msg_Err( p_this, "list allocation failed!" ); p_list->i_count = 0; break; @@ -1079,6 +835,7 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) p_list->i_count = 0; ListChildren( p_list, p_this, i_type ); + vlc_mutex_unlock( &structure_lock ); break; default: @@ -1087,11 +844,30 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) break; } - vlc_mutex_unlock( &structure_lock ); - return p_list; } +/** + * Gets the list of children of an objects, and increment their reference + * count. + * @return a list (possibly empty) or NULL in case of error. + */ +vlc_list_t *__vlc_list_children( vlc_object_t *obj ) +{ + vlc_list_t *l; + vlc_object_internals_t *priv = vlc_internals( obj ); + + vlc_mutex_lock( &structure_lock ); + l = NewList( priv->i_children ); + for (int i = 0; i < l->i_count; i++) + { + vlc_object_yield( priv->pp_children[i] ); + l->p_values[i].p_object = priv->pp_children[i]; + } + vlc_mutex_unlock( &structure_lock ); + return l; +} + /***************************************************************************** * DumpCommand: print the current vlc structure ***************************************************************************** @@ -1102,32 +878,20 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - libvlc_global_data_t *p_libvlc_global = vlc_global(); + libvlc_int_t *p_libvlc = p_this->p_libvlc; (void)oldval; (void)p_data; if( *psz_cmd == 'l' ) { - vlc_mutex_lock( &structure_lock ); - - vlc_object_t **pp_current, **pp_end; + vlc_object_t *cur = VLC_OBJECT (p_libvlc); - pp_current = p_libvlc_global->pp_objects; - pp_end = pp_current + p_libvlc_global->i_objects; - - for( ; pp_current < pp_end ; pp_current++ ) + vlc_mutex_lock( &structure_lock ); + do { - if( (*pp_current)->p_internals->b_attached ) - { - PrintObject( *pp_current, "" ); - } - else - { - printf( " o %.8i %s (not attached)\n", - (*pp_current)->i_object_id, - (*pp_current)->psz_object_type ); - } + PrintObject (cur, ""); + cur = vlc_internals (cur)->next; } - + while (cur != VLC_OBJECT(p_libvlc)); vlc_mutex_unlock( &structure_lock ); } else @@ -1138,29 +902,9 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, { char *end; int i_id = strtol( newval.psz_string, &end, 0 ); - if( end != newval.psz_string ) - p_object = vlc_object_get( i_id ); - else - { - /* try using the object's name to find it */ - vlc_object_t *p_libvlc = vlc_object_get( 1 ); - if( p_libvlc ) - { - /* Look in p_libvlc's children tree */ - p_object = vlc_object_find_name( p_libvlc, - newval.psz_string, - FIND_CHILD ); - vlc_object_release( p_libvlc ); - } - if( !p_object ) - { - /* If it's not in libvlc, look in libvlc_global (== p_this) */ - p_object = vlc_object_find_name( p_this, - newval.psz_string, - FIND_CHILD ); - } - } - + /* try using the object's name to find it */ + p_object = vlc_object_find_name( p_this, newval.psz_string, + FIND_ANYWHERE ); if( !p_object ) { return VLC_ENOOBJ; @@ -1174,7 +918,7 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1]; if( !p_object ) - p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this; + p_object = VLC_OBJECT(p_this->p_libvlc); psz_foo[0] = '|'; DumpStructure( p_object, 0, psz_foo ); @@ -1188,11 +932,11 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, PrintObject( p_object, "" ); - if( !p_object->p_internals->i_vars ) + if( !vlc_internals( p_object )->i_vars ) printf( " `-o No variables\n" ); - for( i = 0; i < p_object->p_internals->i_vars; i++ ) + for( i = 0; i < vlc_internals( p_object )->i_vars; i++ ) { - variable_t *p_var = p_object->p_internals->p_vars + i; + variable_t *p_var = vlc_internals( p_object )->p_vars + i; const char *psz_type = "unknown"; switch( p_var->i_type & VLC_VAR_TYPE ) @@ -1218,16 +962,18 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, #undef MYCASE } printf( " %c-o \"%s\" (%s", - i + 1 == p_object->p_internals->i_vars ? '`' : '|', + i + 1 == vlc_internals( p_object )->i_vars ? '`' : '|', p_var->psz_name, psz_type ); if( p_var->psz_text ) printf( ", %s", p_var->psz_text ); printf( ")" ); + if( p_var->i_type & VLC_VAR_HASCHOICE ) + printf( ", has choices" ); if( p_var->i_type & VLC_VAR_ISCOMMAND ) printf( ", command" ); if( p_var->i_entries ) printf( ", %d callbacks", p_var->i_entries ); - switch( p_var->i_type & 0x00f0 ) + switch( p_var->i_type & VLC_VAR_CLASS ) { case VLC_VAR_VOID: case VLC_VAR_MUTEX: @@ -1245,7 +991,7 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, printf( ": %f", p_var->val.f_float ); break; case VLC_VAR_TIME: - printf( ": " I64Fi, (int64_t)p_var->val.i_time ); + printf( ": %"PRIi64, (int64_t)p_var->val.i_time ); break; case VLC_VAR_ADDRESS: printf( ": %p", p_var->val.p_address ); @@ -1288,48 +1034,20 @@ void vlc_list_release( vlc_list_t *p_list ) free( p_list ); } -/* 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. + * dump an object. (Debug function) *****************************************************************************/ -static int FindIndex( vlc_object_t *p_this, - vlc_object_t **pp_objects, int i_count ) +static void vlc_object_dump( vlc_object_t *p_this ) { - int i_middle = i_count / 2; - - if( i_count == 0 ) - { - return 0; - } - - if( pp_objects[i_middle] == p_this ) - { - return i_middle; - } + char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1]; + psz_foo[0] = '|'; - 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 ); - } + vlc_assert_locked( &structure_lock ); + DumpStructure( p_this, 0, psz_foo ); } +/* Following functions are local */ + static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) { int i; @@ -1343,7 +1061,7 @@ static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) { if( p_tmp->i_object_type == i_type ) { - vlc_object_yield_locked( p_tmp ); + vlc_object_yield( p_tmp ); return p_tmp; } else @@ -1354,15 +1072,15 @@ static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) break; case FIND_CHILD: - for( i = p_this->i_children; i--; ) + for( i = vlc_internals( p_this )->i_children; i--; ) { - p_tmp = p_this->pp_children[i]; + p_tmp = vlc_internals( p_this )->pp_children[i]; if( p_tmp->i_object_type == i_type ) { - vlc_object_yield_locked( p_tmp ); + vlc_object_yield( p_tmp ); return p_tmp; } - else if( p_tmp->i_children ) + else if( vlc_internals( p_tmp )->i_children ) { p_tmp = FindObject( p_tmp, i_type, i_mode ); if( p_tmp ) @@ -1397,7 +1115,7 @@ static vlc_object_t * FindObjectName( vlc_object_t *p_this, if( p_tmp->psz_object_name && !strcmp( p_tmp->psz_object_name, psz_name ) ) { - vlc_object_yield_locked( p_tmp ); + vlc_object_yield( p_tmp ); return p_tmp; } else @@ -1408,16 +1126,16 @@ static vlc_object_t * FindObjectName( vlc_object_t *p_this, break; case FIND_CHILD: - for( i = p_this->i_children; i--; ) + for( i = vlc_internals( p_this )->i_children; i--; ) { - p_tmp = p_this->pp_children[i]; + p_tmp = vlc_internals( p_this )->pp_children[i]; if( p_tmp->psz_object_name && !strcmp( p_tmp->psz_object_name, psz_name ) ) { - vlc_object_yield_locked( p_tmp ); + vlc_object_yield( p_tmp ); return p_tmp; } - else if( p_tmp->i_children ) + else if( vlc_internals( p_tmp )->i_children ) { p_tmp = FindObjectName( p_tmp, psz_name, i_mode ); if( p_tmp ) @@ -1436,63 +1154,14 @@ static vlc_object_t * FindObjectName( vlc_object_t *p_this, return NULL; } -static void DetachObject( vlc_object_t *p_this ) -{ - vlc_object_t *p_parent = p_this->p_parent; - int i_index, i; - - /* Remove p_this's parent */ - p_this->p_parent = NULL; - - /* Remove all of p_parent's children which are p_this */ - for( i_index = p_parent->i_children ; i_index-- ; ) - { - if( p_parent->pp_children[i_index] == p_this ) - { - p_parent->i_children--; - for( i = i_index ; i < p_parent->i_children ; i++ ) - { - p_parent->pp_children[i] = p_parent->pp_children[i+1]; - } - } - } - - if( p_parent->i_children ) - { - p_parent->pp_children = (vlc_object_t **)realloc( p_parent->pp_children, - p_parent->i_children * sizeof(vlc_object_t *) ); - } - else - { - free( p_parent->pp_children ); - p_parent->pp_children = NULL; - } -} - -/***************************************************************************** - * SetAttachment: recursively set the b_attached flag of a subtree. - ***************************************************************************** - * This function is used by the attach and detach functions to propagate - * the b_attached flag in a subtree. - *****************************************************************************/ -static void SetAttachment( vlc_object_t *p_this, vlc_bool_t b_attached ) -{ - int i_index; - - for( i_index = p_this->i_children ; i_index-- ; ) - { - SetAttachment( p_this->pp_children[i_index], b_attached ); - } - - p_this->p_internals->b_attached = b_attached; -} static void PrintObject( vlc_object_t *p_this, const char *psz_prefix ) { char psz_children[20], psz_refcount[20], psz_thread[30], psz_name[50], psz_parent[20]; - psz_name[0] = '\0'; + int canc = vlc_savecancel (); + memset( &psz_name, 0, sizeof(psz_name) ); if( p_this->psz_object_name ) { snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name ); @@ -1501,7 +1170,7 @@ static void PrintObject( vlc_object_t *p_this, const char *psz_prefix ) } psz_children[0] = '\0'; - switch( p_this->i_children ) + switch( vlc_internals( p_this )->i_children ) { case 0: break; @@ -1509,32 +1178,30 @@ static void PrintObject( vlc_object_t *p_this, const char *psz_prefix ) strcpy( psz_children, ", 1 child" ); break; default: - snprintf( psz_children, 19, ", %i children", p_this->i_children ); + snprintf( psz_children, 19, ", %i children", + vlc_internals( p_this )->i_children ); break; } psz_refcount[0] = '\0'; - if( p_this->p_internals->i_refcount > 0 ) + if( vlc_internals( p_this )->i_refcount > 0 ) snprintf( psz_refcount, 19, ", refcount %u", - p_this->p_internals->i_refcount ); + vlc_internals( p_this )->i_refcount ); psz_thread[0] = '\0'; - if( p_this->p_internals->b_thread ) - snprintf( psz_thread, 29, " (thread %u)", -#if defined(WIN32) || defined(UNDER_CE) - (unsigned)p_this->p_internals->thread_id.id ); -#else - (unsigned)p_this->p_internals->thread_id ); -#endif + if( vlc_internals( p_this )->b_thread ) + snprintf( psz_thread, 29, " (thread %lu)", + (unsigned long)vlc_internals( p_this )->thread_id ); psz_parent[0] = '\0'; if( p_this->p_parent ) - snprintf( psz_parent, 19, ", parent %i", p_this->p_parent->i_object_id ); + snprintf( psz_parent, 19, ", parent %p", p_this->p_parent ); - printf( " %so %.8i %s%s%s%s%s%s\n", psz_prefix, - p_this->i_object_id, p_this->psz_object_type, + printf( " %so %p %s%s%s%s%s%s\n", psz_prefix, + p_this, p_this->psz_object_type, psz_name, psz_thread, psz_refcount, psz_children, psz_parent ); + vlc_restorecancel (canc); } static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo ) @@ -1553,7 +1220,7 @@ static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo ) return; } - for( i = 0 ; i < p_this->i_children ; i++ ) + for( i = 0 ; i < vlc_internals( p_this )->i_children ; i++ ) { if( i_level ) { @@ -1565,7 +1232,7 @@ static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo ) } } - if( i == p_this->i_children - 1 ) + if( i == vlc_internals( p_this )->i_children - 1 ) { psz_foo[i_level] = '`'; } @@ -1577,7 +1244,8 @@ static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo ) psz_foo[i_level+1] = '-'; psz_foo[i_level+2] = '\0'; - DumpStructure( p_this->pp_children[i], i_level + 2, psz_foo ); + DumpStructure( vlc_internals( p_this )->pp_children[i], i_level + 2, + psz_foo ); } } @@ -1615,7 +1283,7 @@ static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object, return; } - vlc_object_yield_locked( p_object ); + vlc_object_yield( p_object ); p_list->p_values[i_index].p_object = p_object; @@ -1637,7 +1305,7 @@ static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object, return; } - vlc_object_yield_locked( p_object ); + vlc_object_yield( p_object ); p_list->p_values[p_list->i_count].p_object = p_object; p_list->i_count++; @@ -1650,19 +1318,15 @@ static int CountChildren( vlc_object_t *p_this, int i_type ) vlc_object_t *p_tmp; int i, i_count = 0; - for( i = 0; i < p_this->i_children; i++ ) + for( i = 0; i < vlc_internals( p_this )->i_children; i++ ) { - p_tmp = p_this->pp_children[i]; + p_tmp = vlc_internals( p_this )->pp_children[i]; if( p_tmp->i_object_type == i_type ) { i_count++; } - - if( p_tmp->i_children ) - { - i_count += CountChildren( p_tmp, i_type ); - } + i_count += CountChildren( p_tmp, i_type ); } return i_count; @@ -1673,18 +1337,13 @@ static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type ) vlc_object_t *p_tmp; int i; - for( i = 0; i < p_this->i_children; i++ ) + for( i = 0; i < vlc_internals( p_this )->i_children; i++ ) { - p_tmp = p_this->pp_children[i]; + p_tmp = vlc_internals( p_this )->pp_children[i]; if( p_tmp->i_object_type == i_type ) - { ListReplace( p_list, p_tmp, p_list->i_count++ ); - } - if( p_tmp->i_children ) - { - ListChildren( p_list, p_tmp, i_type ); - } + ListChildren( p_list, p_tmp, i_type ); } }