X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fobjects.c;h=b872f3f0feac8495fa3b8016a75e5205b9600946;hb=3e1ec376dd2ab91d2c94184bc1f0da0b0072caad;hp=070193dd4072f9422c24a89306c7b15d74dbabdf;hpb=6accad54cacc1db8bcc445bdd643e0ed42d8687b;p=vlc diff --git a/src/misc/objects.c b/src/misc/objects.c index 070193dd40..b872f3f0fe 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 +#if defined (HAVE_SYS_EVENTFD_H) +# include +# define HAVE_EVENTFD 1 +#endif + + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -83,18 +81,13 @@ 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 void close_nocancel (int fd) -{ - int canc = vlc_savecancel (); - close (fd); - vlc_restorecancel (canc); -} - static void libvlc_lock (libvlc_int_t *p_libvlc) { vlc_mutex_lock (&(libvlc_priv (p_libvlc)->structure_lock)); @@ -127,7 +120,7 @@ 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; @@ -141,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 ) { @@ -170,11 +163,8 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, 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_cond_init( &p_priv->var_wait ); - vlc_spin_init( &p_priv->spin ); p_priv->pipes[0] = p_priv->pipes[1] = -1; p_priv->next = p_this; @@ -227,10 +217,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) 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"; @@ -259,7 +245,10 @@ 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 ); } /** @@ -305,10 +294,7 @@ static void vlc_object_destroy( vlc_object_t *p_this ) FREENULL( p_this->psz_object_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] ); @@ -319,19 +305,6 @@ static void vlc_object_destroy( vlc_object_t *p_this ) } -/** 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 @@ -385,6 +358,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()). @@ -399,115 +374,63 @@ error: */ 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_mutex_lock( &pipe_lock ); + if( !p_this->b_die ) + { + fd = priv->pipes[1]; + p_this->b_die = true; + } - vlc_spin_lock (&priv->spin); - fd = priv->pipes[1]; - priv->pipes[1] = -1; - vlc_spin_unlock (&priv->spin); + /* This also serves as a memory barrier toward vlc_object_alive(): */ + vlc_mutex_unlock( &pipe_lock ); - if( fd != -1 ) + if (fd != -1) { + 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"); - close_nocancel (fd); + vlc_restorecancel (canc); } - - vlc_cond_broadcast (&priv->wait); - /* This also serves as a memory barrier toward vlc_object_alive(): */ - vlc_object_unlock( p_this ); } @@ -522,7 +445,8 @@ 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_hold( p_this ); return p_this; @@ -651,8 +575,6 @@ void __vlc_object_release( vlc_object_t *p_this ) if( b_should_destroy ) { - /* We have no children */ - assert (internals->i_children == 0); parent = p_this->p_parent; #ifndef NDEBUG @@ -686,6 +608,9 @@ void __vlc_object_release( vlc_object_t *p_this ) if (parent) /* Detach from parent to protect against FIND_CHILDREN */ vlc_object_detach_unlocked (p_this); + + /* We have no children */ + assert (internals->i_children == 0); } libvlc_unlock (p_this->p_libvlc); @@ -796,7 +721,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; @@ -805,7 +730,7 @@ vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode ) switch( i_mode & 0x000f ) { case FIND_ANYWHERE: - 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: libvlc_lock (p_this->p_libvlc); @@ -1020,6 +945,7 @@ 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]; @@ -1027,6 +953,7 @@ static void vlc_object_dump( vlc_object_t *p_this ) DumpStructure( p_this, 0, psz_foo ); } +#endif /* Following functions are local */ @@ -1041,7 +968,7 @@ 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_hold( p_tmp ); return p_tmp; @@ -1057,7 +984,7 @@ 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_hold( p_tmp ); return p_tmp; @@ -1304,7 +1231,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++; } @@ -1323,7 +1250,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 );