# include <fcntl.h>
# include <errno.h> /* ENOSYS */
#endif
+#ifdef HAVE_SYS_EVENTFD_H
+# include <sys/eventfd.h>
+#endif
#include <assert.h>
/*****************************************************************************
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));
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_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 )
{
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;
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";
}
free( p_priv->p_vars );
+ vlc_cond_destroy( &p_priv->var_wait );
vlc_mutex_destroy( &p_priv->var_lock );
free( p_this->psz_header );
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] );
vlc_assert_locked( &(vlc_internals(obj)->lock) );
vlc_mutex_unlock( &(vlc_internals(obj)->lock) );
}
+void __vlc_object_assert_locked( vlc_object_t *obj )
+{
+ vlc_assert_locked( &(vlc_internals(obj)->lock) );
+}
#ifdef WIN32
# include <winsock2.h>
* @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_object_lock (obj);
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_object_unlock (obj);
return internals->pipes[0];
}
/**
- * 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 )
+ 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 );
+
+ 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");
+ vlc_restorecancel (canc);
+ }
}
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;
/* 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_Hold()");
-#endif
return vlc_object_find (p_this->p_libvlc, i_type,
(i_mode & ~0x000f)|FIND_CHILD);
- }
libvlc_lock (p_this->p_libvlc);
p_found = FindObject( p_this, i_type, i_mode );
* 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;
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);
/*****************************************************************************
* 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];
DumpStructure( p_this, 0, psz_foo );
}
+#endif
/* Following functions are local */
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;
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;
{
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++;
}
{
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 );
projects / vlc / blobdiff