X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc%2Fobjects.c;h=8386bbaa2a0d6b2d35633f6e433dbb0abaffa148;hb=4e2f8a6f776ce3cdfc10af017f5483f019afa4be;hp=2db5941bd558295f38f1b1ad552be12c6e18d216;hpb=4f407b68ee89c3df73fdc7967d6baade8f0cc3d2;p=vlc diff --git a/src/misc/objects.c b/src/misc/objects.c index 2db5941bd5..8386bbaa2a 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -39,20 +39,11 @@ #include #include "../libvlc.h" -#include #include #include "audio_output/aout_internal.h" -#include -#include -#include - -#include -#include "stream_output/stream_output.h" - #include "vlc_interface.h" #include "vlc_codec.h" -#include "vlc_filter.h" #include "variables.h" #ifndef WIN32 @@ -62,8 +53,15 @@ # include # include /* ENOSYS */ #endif + +#include #include +#if defined (HAVE_SYS_EVENTFD_H) +# include +#endif + + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -83,19 +81,21 @@ static void ListChildren ( vlc_list_t *, vlc_object_t *, int ); static void vlc_object_destroy( vlc_object_t *p_this ); static void vlc_object_detach_unlocked (vlc_object_t *p_this); +#ifndef NDEBUG static void vlc_object_dump( vlc_object_t *p_this ); +#endif /***************************************************************************** * Local structure lock *****************************************************************************/ -static vlc_mutex_t structure_lock; -static unsigned object_counter = 0; +static void libvlc_lock (libvlc_int_t *p_libvlc) +{ + vlc_mutex_lock (&(libvlc_priv (p_libvlc)->structure_lock)); +} -static void close_nocancel (int fd) +static void libvlc_unlock (libvlc_int_t *p_libvlc) { - int canc = vlc_savecancel (); - close (fd); - vlc_restorecancel (canc); + vlc_mutex_unlock (&(libvlc_priv (p_libvlc)->structure_lock)); } void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, @@ -120,13 +120,12 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, assert (i_size >= sizeof (vlc_object_t)); p_new = (vlc_object_t *)(p_priv + 1); - p_new->i_object_type = i_type; + p_priv->i_object_type = i_type; p_new->psz_object_type = psz_type; - p_new->psz_object_name = NULL; + p_priv->psz_name = NULL; p_new->b_die = false; p_new->b_error = false; - p_new->b_dead = false; p_new->b_force = false; p_new->psz_header = NULL; @@ -135,7 +134,7 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, 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 ); + p_priv->p_vars = calloc( 16, sizeof( variable_t ) ); if( !p_priv->p_vars ) { @@ -145,15 +144,10 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, if( p_this == NULL ) { - if( i_type == VLC_OBJECT_LIBVLC ) - p_new->p_libvlc = (libvlc_int_t*)p_new; - else - { - p_new->p_libvlc = NULL; - vlc_mutex_init( &structure_lock ); - } - - p_this = p_priv->next = p_priv->prev = p_new; + libvlc_int_t *self = (libvlc_int_t*)p_new; + p_new->p_libvlc = self; + vlc_mutex_init (&(libvlc_priv (self)->structure_lock)); + p_this = p_new; } else p_new->p_libvlc = p_this->p_libvlc; @@ -166,28 +160,14 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, p_priv->pp_children = NULL; p_priv->i_children = 0; - p_new->p_private = NULL; - /* Initialize mutexes and condvars */ - 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 ); + vlc_cond_init( &p_priv->var_wait ); p_priv->pipes[0] = p_priv->pipes[1] = -1; - 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; - p_new->i_object_id = object_counter++; /* fetch THEN increment */ - vlc_mutex_unlock( &structure_lock ); - - if( i_type == VLC_OBJECT_LIBVLC ) - { + if (p_new == VLC_OBJECT(p_new->p_libvlc)) + { /* TODO: should be in src/libvlc.c */ 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 ); @@ -214,34 +194,14 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) switch( i_type ) { - case VLC_OBJECT_INTF: - i_size = sizeof(intf_thread_t); - psz_type = "interface"; - break; case VLC_OBJECT_DECODER: i_size = sizeof(decoder_t); psz_type = "decoder"; break; - case VLC_OBJECT_PACKETIZER: - i_size = sizeof(decoder_t); - psz_type = "packetizer"; - break; - case VLC_OBJECT_ENCODER: - i_size = sizeof(encoder_t); - psz_type = "encoder"; - break; case VLC_OBJECT_AOUT: i_size = sizeof(aout_instance_t); psz_type = "audio output"; 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; default: assert( i_type > 0 ); /* unknown type?! */ i_size = i_type; @@ -266,7 +226,41 @@ 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_spin_lock( &p_priv->ref_spin ); p_priv->pf_destructor = pf_destructor; + vlc_spin_unlock( &p_priv->ref_spin ); +} + +static vlc_mutex_t name_lock = VLC_STATIC_MUTEX; + +#undef vlc_object_set_name +int vlc_object_set_name(vlc_object_t *obj, const char *name) +{ + vlc_object_internals_t *priv = vlc_internals(obj); + char *newname = name ? strdup (name) : NULL; + char *oldname; + + vlc_mutex_lock (&name_lock); + oldname = priv->psz_name; + priv->psz_name = newname; + vlc_mutex_unlock (&name_lock); + + free (oldname); + return (priv->psz_name || !name) ? VLC_SUCCESS : VLC_ENOMEM; +} + +#undef vlc_object_get_name +char *vlc_object_get_name(const vlc_object_t *obj) +{ + vlc_object_internals_t *priv = vlc_internals(obj); + char *name; + + vlc_mutex_lock (&name_lock); + name = priv->psz_name ? strdup (priv->psz_name) : NULL; + vlc_mutex_unlock (&name_lock); + + return name; } /** @@ -304,48 +298,25 @@ static void vlc_object_destroy( vlc_object_t *p_this ) } free( p_priv->p_vars ); + vlc_cond_destroy( &p_priv->var_wait ); vlc_mutex_destroy( &p_priv->var_lock ); free( p_this->psz_header ); - if( p_this->p_libvlc == NULL ) - /* We are the global object ... no need to lock. */ - vlc_mutex_destroy( &structure_lock ); - - FREENULL( p_this->psz_object_name ); - -#if defined(WIN32) || defined(UNDER_CE) - /* if object has an associated thread, close it now */ - if( p_priv->thread_id ) - CloseHandle(p_priv->thread_id); -#endif + free( p_priv->psz_name ); 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 ) + if( p_priv->pipes[1] != -1 && p_priv->pipes[1] != p_priv->pipes[0] ) close( p_priv->pipes[1] ); if( p_priv->pipes[0] != -1 ) close( p_priv->pipes[0] ); + if( VLC_OBJECT(p_this->p_libvlc) == p_this ) + vlc_mutex_destroy (&(libvlc_priv ((libvlc_int_t *)p_this)->structure_lock)); free( p_priv ); } -/** Inter-object signaling */ - -void __vlc_object_lock( vlc_object_t *obj ) -{ - vlc_mutex_lock( &(vlc_internals(obj)->lock) ); -} - -void __vlc_object_unlock( vlc_object_t *obj ) -{ - vlc_assert_locked( &(vlc_internals(obj)->lock) ); - vlc_mutex_unlock( &(vlc_internals(obj)->lock) ); -} - #ifdef WIN32 # include # include @@ -399,6 +370,8 @@ error: #define close( a ) closesocket (a) #endif /* WIN32 */ +static vlc_mutex_t pipe_lock = VLC_STATIC_MUTEX; + /** * Returns the readable end of a pipe that becomes readable once termination * of the object is requested (vlc_object_kill()). @@ -411,161 +384,69 @@ error: * @param obj object that would be "killed" * @return a readable pipe descriptor, or -1 on error. */ -int __vlc_object_waitpipe( vlc_object_t *obj ) +int vlc_object_waitpipe( vlc_object_t *obj ) { - int pfd[2] = { -1, -1 }; vlc_object_internals_t *internals = vlc_internals( obj ); - bool killed = false; - vlc_spin_lock (&internals->spin); + vlc_mutex_lock (&pipe_lock); if (internals->pipes[0] == -1) { /* This can only ever happen if someone killed us without locking: */ assert (internals->pipes[1] == -1); - vlc_spin_unlock (&internals->spin); - - if (pipe (pfd)) - return -1; - vlc_spin_lock (&internals->spin); +#ifdef HAVE_EVENTFD + internals->pipes[0] = internals->pipes[1] = eventfd (0, 0); if (internals->pipes[0] == -1) +#endif { - internals->pipes[0] = pfd[0]; - internals->pipes[1] = pfd[1]; - pfd[0] = pfd[1] = -1; + if (pipe (internals->pipes)) + internals->pipes[0] = internals->pipes[1] = -1; } - killed = obj->b_die; - } - vlc_spin_unlock (&internals->spin); - - if (killed) - { - /* Race condition: vlc_object_kill() already invoked! */ - int fd; - - vlc_spin_lock (&internals->spin); - fd = internals->pipes[1]; - internals->pipes[1] = -1; - vlc_spin_unlock (&internals->spin); - msg_Dbg (obj, "waitpipe: object already dying"); - if (fd != -1) - close (fd); + if (internals->pipes[0] != -1 && obj->b_die) + { /* Race condition: vlc_object_kill() already invoked! */ + msg_Dbg (obj, "waitpipe: object already dying"); + write (internals->pipes[1], &(uint64_t){ 1 }, sizeof (uint64_t)); + } } - - /* Race condition: two threads call pipe() - unlikely */ - if (pfd[0] != -1) - close (pfd[0]); - if (pfd[1] != -1) - close (pfd[1]); - + vlc_mutex_unlock (&pipe_lock); return internals->pipes[0]; } /** - * Suspends until another thread calls vlc_object_signal_unlocked(). - * The thread may be woken up earlier due to limitations of the underlying - * implementation. - * - * In new code, please use vlc_cond_wait() instead. - * - * This function is a cancellation point. In case of cancellation, the object - * will be in locked state. - */ -void __vlc_object_wait( vlc_object_t *obj ) -{ - vlc_object_internals_t *priv = vlc_internals( obj ); - vlc_assert_locked( &priv->lock); - vlc_cond_wait( &priv->wait, &priv->lock ); -} - - -/** - * Wakes up one thread waiting on the object. If no thread are (yet) waiting, - * nothing happens. - * - * 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 (&(vlc_internals(obj)->lock)); - vlc_cond_signal( &(vlc_internals(obj)->wait) ); -} - - -/** - * Requests termination of an object. - * If the object is LibVLC, also request to terminate all its children. + * Requests termination of an object, cancels the object thread, and make the + * object wait pipe (if it exists) readable. Not a cancellation point. */ void __vlc_object_kill( vlc_object_t *p_this ) { vlc_object_internals_t *priv = vlc_internals( p_this ); - int fd; + int fd = -1; vlc_thread_cancel( p_this ); - vlc_object_lock( p_this ); - p_this->b_die = true; - - vlc_spin_lock (&priv->spin); - fd = priv->pipes[1]; - priv->pipes[1] = -1; - vlc_spin_unlock (&priv->spin); - - if( fd != -1 ) + vlc_mutex_lock( &pipe_lock ); + if( !p_this->b_die ) { - msg_Dbg (p_this, "waitpipe: object killed"); - close_nocancel (fd); + fd = priv->pipes[1]; + p_this->b_die = true; } - vlc_cond_broadcast (&priv->wait); /* This also serves as a memory barrier toward vlc_object_alive(): */ - vlc_object_unlock( p_this ); -} + vlc_mutex_unlock( &pipe_lock ); - -/** - * Find an object given its ID. - * - * This function looks for the object whose i_object_id field is i_id. - * This function is slow, and often used to hide bugs. Do not use it. - * If you need to retain reference to an object, yield the object pointer with - * vlc_object_yield(), use the pointer as your reference, and call - * vlc_object_release() when you're done. - */ -void * vlc_object_get( libvlc_int_t *p_anchor, int i_id ) -{ - vlc_object_t *obj = NULL; -#ifndef NDEBUG - int canc = vlc_savecancel (); - fprintf (stderr, "Use of deprecated vlc_object_get(%d) ", i_id); - vlc_backtrace (); - vlc_restorecancel (canc); -#endif - vlc_mutex_lock( &structure_lock ); - - for( obj = vlc_internals (p_anchor)->next; - obj != VLC_OBJECT (p_anchor); - obj = vlc_internals (obj)->next ) + if (fd != -1) { - if( obj->i_object_id == i_id ) - { - vlc_object_yield( obj ); - goto out; - } + int canc = vlc_savecancel (); + + /* write _after_ setting b_die, so vlc_object_alive() returns false */ + write (fd, &(uint64_t){ 1 }, sizeof (uint64_t)); + msg_Dbg (p_this, "waitpipe: object killed"); + vlc_restorecancel (canc); } - obj = NULL; -#ifndef NDEBUG - fprintf (stderr, "Object %d does not exist\n", i_id); -#endif -out: - vlc_mutex_unlock( &structure_lock ); - return obj; } -/** - **************************************************************************** + +/***************************************************************************** * find a typed object and increment its refcount ***************************************************************************** * This function recursively looks for a given object type. i_mode can be one @@ -576,37 +457,43 @@ void * __vlc_object_find( vlc_object_t *p_this, int i_type, int i_mode ) vlc_object_t *p_found; /* If we are of the requested type ourselves, don't look further */ - if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type ) + if( !(i_mode & FIND_STRICT) + && vlc_internals (p_this)->i_object_type == i_type ) { - vlc_object_yield( p_this ); + vlc_object_hold( p_this ); return p_this; } /* Otherwise, recursively look for the object */ if ((i_mode & 0x000f) == FIND_ANYWHERE) - { -#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 ); + libvlc_lock (p_this->p_libvlc); p_found = FindObject( p_this, i_type, i_mode ); - vlc_mutex_unlock( &structure_lock ); + libvlc_unlock (p_this->p_libvlc); return p_found; } + +static int objnamecmp(const vlc_object_t *obj, const char *name) +{ + char *objname = vlc_object_get_name(obj); + if (objname == NULL) + return INT_MIN; + + int ret = strcmp (objname, name); + free (objname); + return ret; +} + #undef vlc_object_find_name /** * 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 (i_object_id, psz_object_type, etc). + * 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. * @@ -622,16 +509,17 @@ vlc_object_t *vlc_object_find_name( vlc_object_t *p_this, { vlc_object_t *p_found; + /* Reading psz_object_name from a separate inhibits thread-safety. + * Use a libvlc address variable instead for that sort of things! */ + msg_Warn( p_this, "%s(%s) is not safe!", __func__, psz_name ); /* 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 ) ) + if( !(i_mode & FIND_STRICT) && !objnamecmp(p_this, psz_name) ) { - vlc_object_yield( p_this ); + vlc_object_hold( p_this ); return p_this; } - vlc_mutex_lock( &structure_lock ); + libvlc_lock (p_this->p_libvlc); /* Otherwise, recursively look for the object */ if( (i_mode & 0x000f) == FIND_ANYWHERE ) @@ -658,15 +546,14 @@ vlc_object_t *vlc_object_find_name( vlc_object_t *p_this, p_found = FindObjectName( p_this, psz_name, i_mode ); } - vlc_mutex_unlock( &structure_lock ); - + libvlc_unlock (p_this->p_libvlc); return p_found; } /** * Increment an object reference counter. */ -void __vlc_object_yield( vlc_object_t *p_this ) +void * __vlc_object_hold( vlc_object_t *p_this ) { vlc_object_internals_t *internals = vlc_internals( p_this ); @@ -676,6 +563,7 @@ void __vlc_object_yield( vlc_object_t *p_this ) /* Increment the counter */ internals->i_refcount++; vlc_spin_unlock( &internals->ref_spin ); + return p_this; } /***************************************************************************** @@ -685,6 +573,7 @@ void __vlc_object_yield( vlc_object_t *p_this ) void __vlc_object_release( vlc_object_t *p_this ) { vlc_object_internals_t *internals = vlc_internals( p_this ); + vlc_object_t *parent = NULL; bool b_should_destroy; vlc_spin_lock( &internals->ref_spin ); @@ -702,8 +591,8 @@ void __vlc_object_release( vlc_object_t *p_this ) /* 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 + libvlc_lock (p_this->p_libvlc); + /* Take the spin again. Note that another thread may have held the * object in the (very short) mean time. */ vlc_spin_lock( &internals->ref_spin ); b_should_destroy = --internals->i_refcount == 0; @@ -711,53 +600,24 @@ void __vlc_object_release( vlc_object_t *p_this ) if( b_should_destroy ) { -#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 (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_this->p_parent) + /* Detach from parent to protect against FIND_CHILDREN */ + vlc_object_detach_unlocked (p_this); - 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; + /* We have no children */ + assert (internals->i_children == 0); } - - vlc_mutex_unlock( &structure_lock ); + libvlc_unlock (p_this->p_libvlc); 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); + if (parent) + vlc_object_release (parent); } } @@ -772,7 +632,8 @@ void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent ) { if( !p_this ) return; - vlc_mutex_lock( &structure_lock ); + vlc_object_hold (p_parent); + libvlc_lock (p_this->p_libvlc); /* Attach the parent to its child */ assert (!p_this->p_parent); @@ -782,15 +643,12 @@ void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent ) 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 ); + libvlc_unlock (p_this->p_libvlc); } static void vlc_object_detach_unlocked (vlc_object_t *p_this) { - vlc_assert_locked (&structure_lock); - if (p_this->p_parent == NULL) return; @@ -814,8 +672,11 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this) if( priv->i_children ) { - priv->pp_children = (vlc_object_t **)realloc( priv->pp_children, - priv->i_children * sizeof(vlc_object_t *) ); + 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 { @@ -834,14 +695,17 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this) *****************************************************************************/ void __vlc_object_detach( vlc_object_t *p_this ) { + vlc_object_t *p_parent; if( !p_this ) return; - vlc_mutex_lock( &structure_lock ); - if( !p_this->p_parent ) - msg_Err( p_this, "object is not attached" ); - else + libvlc_lock (p_this->p_libvlc); + p_parent = p_this->p_parent; + if (p_parent) vlc_object_detach_unlocked( p_this ); - vlc_mutex_unlock( &structure_lock ); + libvlc_unlock (p_this->p_libvlc); + + if (p_parent) + vlc_object_release (p_parent); } @@ -852,7 +716,7 @@ void __vlc_object_detach( vlc_object_t *p_this ) * This function recursively looks for a given object type. i_mode can be one * of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE. *****************************************************************************/ -vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) +vlc_list_t * vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) { vlc_list_t *p_list; int i_count = 0; @@ -861,31 +725,24 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) switch( i_mode & 0x000f ) { case FIND_ANYWHERE: - /* 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); + return vlc_list_find (VLC_OBJECT(p_this->p_libvlc), i_type, FIND_CHILD); case FIND_CHILD: - vlc_mutex_lock( &structure_lock ); + libvlc_lock (p_this->p_libvlc); 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!" ); + libvlc_unlock (p_this->p_libvlc); p_list->i_count = 0; break; } p_list->i_count = 0; ListChildren( p_list, p_this, i_type ); - vlc_mutex_unlock( &structure_lock ); + libvlc_unlock (p_this->p_libvlc); break; default: @@ -907,14 +764,14 @@ 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 ); + libvlc_lock (obj->p_libvlc); l = NewList( priv->i_children ); for (int i = 0; i < l->i_count; i++) { - vlc_object_yield( priv->pp_children[i] ); + vlc_object_hold( priv->pp_children[i] ); l->p_values[i].p_object = priv->pp_children[i]; } - vlc_mutex_unlock( &structure_lock ); + libvlc_unlock (obj->p_libvlc); return l; } @@ -928,144 +785,117 @@ vlc_list_t *__vlc_list_children( vlc_object_t *obj ) static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - libvlc_int_t *p_libvlc = p_this->p_libvlc; - (void)oldval; (void)p_data; - if( *psz_cmd == 'l' ) - { - vlc_object_t *cur = VLC_OBJECT (p_libvlc); + vlc_object_t *p_object = NULL; - vlc_mutex_lock( &structure_lock ); - do + if( *newval.psz_string ) + { + /* 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 ) { - PrintObject (cur, ""); - cur = vlc_internals (cur)->next; + return VLC_ENOOBJ; } - while (cur != VLC_OBJECT(p_libvlc)); - vlc_mutex_unlock( &structure_lock ); } - else + + libvlc_lock (p_this->p_libvlc); + if( *psz_cmd == 't' ) { - vlc_object_t *p_object = NULL; + char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1]; - if( *newval.psz_string ) - { - char *end; - int i_id = strtol( newval.psz_string, &end, 0 ); - if( !*end ) - p_object = vlc_object_get( p_libvlc, i_id ); - else - /* 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 ) + p_object = VLC_OBJECT(p_this->p_libvlc); - if( !p_object ) - { - return VLC_ENOOBJ; - } - } - - vlc_mutex_lock( &structure_lock ); + psz_foo[0] = '|'; + DumpStructure( p_object, 0, psz_foo ); + } + else if( *psz_cmd == 'v' ) + { + int i; - if( *psz_cmd == 't' ) - { - 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; - if( !p_object ) - p_object = VLC_OBJECT(p_this->p_libvlc); + PrintObject( p_object, "" ); - psz_foo[0] = '|'; - DumpStructure( p_object, 0, psz_foo ); - } - else if( *psz_cmd == 'v' ) + if( !vlc_internals( p_object )->i_vars ) + printf( " `-o No variables\n" ); + for( i = 0; i < vlc_internals( p_object )->i_vars; i++ ) { - int i; - - if( !p_object ) - p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this; + variable_t *p_var = vlc_internals( p_object )->p_vars + i; + const char *psz_type = "unknown"; - PrintObject( p_object, "" ); - - if( !vlc_internals( p_object )->i_vars ) - printf( " `-o No variables\n" ); - for( i = 0; i < vlc_internals( p_object )->i_vars; i++ ) + switch( p_var->i_type & VLC_VAR_TYPE ) { - variable_t *p_var = vlc_internals( p_object )->p_vars + i; - - const char *psz_type = "unknown"; - switch( p_var->i_type & VLC_VAR_TYPE ) - { #define MYCASE( type, nice ) \ - case VLC_VAR_ ## type: \ - psz_type = nice; \ - break; - MYCASE( VOID, "void" ); - MYCASE( BOOL, "bool" ); - MYCASE( INTEGER, "integer" ); - MYCASE( HOTKEY, "hotkey" ); - MYCASE( STRING, "string" ); - MYCASE( MODULE, "module" ); - MYCASE( FILE, "file" ); - MYCASE( DIRECTORY, "directory" ); - MYCASE( VARIABLE, "variable" ); - MYCASE( FLOAT, "float" ); - MYCASE( TIME, "time" ); - MYCASE( ADDRESS, "address" ); - MYCASE( MUTEX, "mutex" ); - MYCASE( LIST, "list" ); + case VLC_VAR_ ## type: \ + psz_type = nice; \ + break; + MYCASE( VOID, "void" ); + MYCASE( BOOL, "bool" ); + MYCASE( INTEGER, "integer" ); + MYCASE( HOTKEY, "hotkey" ); + MYCASE( STRING, "string" ); + MYCASE( MODULE, "module" ); + MYCASE( FILE, "file" ); + MYCASE( DIRECTORY, "directory" ); + MYCASE( VARIABLE, "variable" ); + MYCASE( FLOAT, "float" ); + MYCASE( TIME, "time" ); + MYCASE( ADDRESS, "address" ); + MYCASE( MUTEX, "mutex" ); + MYCASE( LIST, "list" ); #undef MYCASE - } - printf( " %c-o \"%s\" (%s", - 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 ) - { - case VLC_VAR_VOID: - case VLC_VAR_MUTEX: - break; - case VLC_VAR_BOOL: - printf( ": %s", p_var->val.b_bool ? "true" : "false" ); - break; - case VLC_VAR_INTEGER: - printf( ": %d", p_var->val.i_int ); - break; - case VLC_VAR_STRING: - printf( ": \"%s\"", p_var->val.psz_string ); - break; - case VLC_VAR_FLOAT: - printf( ": %f", p_var->val.f_float ); - break; - case VLC_VAR_TIME: - printf( ": %"PRIi64, (int64_t)p_var->val.i_time ); - break; - case VLC_VAR_ADDRESS: - printf( ": %p", p_var->val.p_address ); - break; - case VLC_VAR_LIST: - printf( ": TODO" ); - break; - } - printf( "\n" ); } - } - - vlc_mutex_unlock( &structure_lock ); - - if( *newval.psz_string ) - { - vlc_object_release( p_object ); + printf( " %c-o \"%s\" (%s", + 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 & VLC_VAR_CLASS ) + { + case VLC_VAR_VOID: + case VLC_VAR_MUTEX: + break; + case VLC_VAR_BOOL: + printf( ": %s", p_var->val.b_bool ? "true" : "false" ); + break; + case VLC_VAR_INTEGER: + printf( ": %d", p_var->val.i_int ); + break; + case VLC_VAR_STRING: + printf( ": \"%s\"", p_var->val.psz_string ); + break; + case VLC_VAR_FLOAT: + printf( ": %f", p_var->val.f_float ); + break; + case VLC_VAR_TIME: + printf( ": %"PRIi64, (int64_t)p_var->val.i_time ); + break; + case VLC_VAR_ADDRESS: + printf( ": %p", p_var->val.p_address ); + break; + case VLC_VAR_LIST: + printf( ": TODO" ); + break; + } + printf( "\n" ); } } + libvlc_unlock (p_this->p_libvlc); + if( *newval.psz_string ) + { + vlc_object_release( p_object ); + } return VLC_SUCCESS; } @@ -1091,14 +921,15 @@ void vlc_list_release( vlc_list_t *p_list ) /***************************************************************************** * dump an object. (Debug function) *****************************************************************************/ +#ifndef NDEBUG static void vlc_object_dump( vlc_object_t *p_this ) { char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1]; psz_foo[0] = '|'; - vlc_assert_locked( &structure_lock ); DumpStructure( p_this, 0, psz_foo ); } +#endif /* Following functions are local */ @@ -1113,9 +944,9 @@ static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) p_tmp = p_this->p_parent; if( p_tmp ) { - if( p_tmp->i_object_type == i_type ) + if( vlc_internals( p_tmp )->i_object_type == i_type ) { - vlc_object_yield( p_tmp ); + vlc_object_hold( p_tmp ); return p_tmp; } else @@ -1129,9 +960,9 @@ static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) for( i = vlc_internals( p_this )->i_children; i--; ) { p_tmp = vlc_internals( p_this )->pp_children[i]; - if( p_tmp->i_object_type == i_type ) + if( vlc_internals( p_tmp )->i_object_type == i_type ) { - vlc_object_yield( p_tmp ); + vlc_object_hold( p_tmp ); return p_tmp; } else if( vlc_internals( p_tmp )->i_children ) @@ -1166,10 +997,9 @@ static vlc_object_t * FindObjectName( vlc_object_t *p_this, p_tmp = p_this->p_parent; if( p_tmp ) { - if( p_tmp->psz_object_name - && !strcmp( p_tmp->psz_object_name, psz_name ) ) + if( !objnamecmp(p_tmp, psz_name) ) { - vlc_object_yield( p_tmp ); + vlc_object_hold( p_tmp ); return p_tmp; } else @@ -1183,10 +1013,9 @@ static vlc_object_t * FindObjectName( vlc_object_t *p_this, for( i = vlc_internals( p_this )->i_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 ) ) + if( !objnamecmp(p_tmp, psz_name ) ) { - vlc_object_yield( p_tmp ); + vlc_object_hold( p_tmp ); return p_tmp; } else if( vlc_internals( p_tmp )->i_children ) @@ -1216,9 +1045,11 @@ static void PrintObject( vlc_object_t *p_this, const char *psz_prefix ) int canc = vlc_savecancel (); memset( &psz_name, 0, sizeof(psz_name) ); - if( p_this->psz_object_name ) + char *name = vlc_object_get_name(p_this); + if( name ) { - snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name ); + snprintf( psz_name, 49, " \"%s\"", name ); + free( name ); if( psz_name[48] ) psz_name[48] = '\"'; } @@ -1249,10 +1080,10 @@ static void PrintObject( vlc_object_t *p_this, const char *psz_prefix ) 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); @@ -1337,7 +1168,7 @@ static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object, return; } - vlc_object_yield( p_object ); + vlc_object_hold( p_object ); p_list->p_values[i_index].p_object = p_object; @@ -1359,7 +1190,7 @@ static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object, return; } - vlc_object_yield( p_object ); + vlc_object_hold( p_object ); p_list->p_values[p_list->i_count].p_object = p_object; p_list->i_count++; @@ -1376,7 +1207,7 @@ static int CountChildren( vlc_object_t *p_this, int i_type ) { p_tmp = vlc_internals( p_this )->pp_children[i]; - if( p_tmp->i_object_type == i_type ) + if( vlc_internals( p_tmp )->i_object_type == i_type ) { i_count++; } @@ -1395,7 +1226,7 @@ static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type ) { p_tmp = vlc_internals( p_this )->pp_children[i]; - if( p_tmp->i_object_type == i_type ) + if( vlc_internals( p_tmp )->i_object_type == i_type ) ListReplace( p_list, p_tmp, p_list->i_count++ ); ListChildren( p_list, p_tmp, i_type );