* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2004-2008 the VideoLAN team
- * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/**
* \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.
*/
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "../libvlc.h"
#include <vlc_vout.h>
/*****************************************************************************
* Local structure lock
*****************************************************************************/
-static vlc_mutex_t structure_lock;
-static vlc_threadvar_t thread_object;
+static vlc_mutex_t structure_lock;
+static unsigned object_counter = 0;
+
+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 )
+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;
return NULL;
}
- libvlc_global_data_t *p_libvlc_global;
if( p_this == NULL )
{
- /* Only the global root object is created out of the blue */
- p_libvlc_global = (libvlc_global_data_t *)p_new;
- p_new->p_libvlc = NULL;
-
- p_libvlc_global->i_counter = 0;
- p_priv->next = p_priv->prev = p_new;
- vlc_mutex_init( &structure_lock );
- }
- else
- {
- p_libvlc_global = vlc_global();
if( i_type == VLC_OBJECT_LIBVLC )
p_new->p_libvlc = (libvlc_int_t*)p_new;
else
- p_new->p_libvlc = p_this->p_libvlc;
+ {
+ p_new->p_libvlc = NULL;
+ vlc_mutex_init( &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_new->p_private = NULL;
/* Initialize mutexes and condvars */
- vlc_mutex_init( &p_new->object_lock );
- vlc_cond_init( p_new, &p_new->object_wait );
+ vlc_mutex_init( &p_priv->lock );
+ vlc_cond_init( p_new, &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;
- p_priv->next = VLC_OBJECT (p_libvlc_global);
-#if defined (NDEBUG)
- /* ... */
-#elif defined (LIBVLC_USE_PTRHEAD)
- p_priv->creator_id = pthread_self ();
-#elif defined (WIN32)
- p_priv->creator_id = GetCurrentThreadId ();
-#endif
+ p_priv->next = p_this;
vlc_mutex_lock( &structure_lock );
- p_priv->prev = vlc_internals (p_libvlc_global)->prev;
- vlc_internals (p_libvlc_global)->prev = p_new;
+ 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 = p_libvlc_global->i_counter++;
+ p_new->i_object_id = object_counter++; /* fetch THEN increment */
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;
switch( i_type )
{
- 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_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";
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_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_OPENGL:
i_size = sizeof( vout_thread_t );
psz_type = "opengl";
i_size = sizeof( announce_handler_t );
psz_type = "announce";
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;
* 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 )
{
/* Send a kill to the object's thread if applicable */
vlc_object_kill( p_this );
- /* If we are running on a thread, wait until it ends */
- if( p_priv->b_thread )
- vlc_thread_join( 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. */
while( p_priv->i_vars )
free( p_this->psz_header );
- if( p_this->p_libvlc == NULL )
- {
- libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
-
#ifndef NDEBUG
- assert( p_global == vlc_global() );
+ if( VLC_OBJECT(p_this->p_libvlc) == p_this )
+ {
/* Test for leaks */
- if (p_priv->next != p_this)
+ vlc_object_t *leaked = p_priv->next;
+ while( leaked != p_this )
{
- vlc_object_t *leaked = p_priv->next, *first = leaked;
- do
- {
- /* 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 libvlc object to ease debugging */
- vlc_object_dump( leaked );
- fflush(stderr);
- leaked = vlc_internals (leaked)->next;
- }
- while (leaked != first);
+ /* 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;
+ }
- /* Dump global object to ease debugging */
+ if( p_priv->next != p_this )
+ /* Dump libvlc object to ease debugging */
vlc_object_dump( p_this );
- /* Strongly abort, cause we want these to be fixed */
- abort();
- }
+ }
#endif
+ 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 );
#endif
vlc_spin_destroy( &p_priv->ref_spin );
- vlc_mutex_destroy( &p_this->object_lock );
- vlc_cond_destroy( &p_this->object_wait );
+ 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] );
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
/**
* 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.
+ * It is assumed that the caller has locked the object. This function will
+ * unlock the object, and lock it again before returning.
+ * If the object was signaled before the caller locked the object, it is
+ * undefined whether the signal will be lost or will wake the process.
+ *
+ * This function is a cancellation point. In case of cancellation, the object
+ * will be in locked state.
*
* @return true if the object is dying and should terminate.
*/
-bool __vlc_object_wait( vlc_object_t *obj )
+void __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;
+ vlc_object_internals_t *priv = vlc_internals( obj );
+ vlc_assert_locked( &priv->lock);
+ vlc_cond_wait( &priv->wait, &priv->lock );
}
/**
* 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.
- *
- * @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.
- */
-int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
-{
- 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;
-}
-
-
-/**
- * Checks whether an object has been "killed".
- * The object lock must be held.
- *
- * Typical code for an object thread could be:
+ * a timer to expire. It is asserted that the caller holds the object lock.
*
- vlc_object_lock (self);
- ...initialization...
- while (vlc_object_alive (self))
- {
- ...preprocessing...
-
- if (vlc_object_wait (self))
- continue;
-
- ...postprocessing...
- }
- ...deinitialization...
- vlc_object_unlock (self);
+ * This function is a cancellation point. In case of cancellation, the object
+ * will be in locked state.
*
- *
- * @return true iff the object has not been killed yet
+ * @return 0 if the object was signaled before the timer expiration, or
+ * ETIMEDOUT if the timer expired without any signal.
*/
-bool __vlc_object_alive( vlc_object_t *obj )
+int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
{
- vlc_assert_locked( &obj->object_lock );
- return !obj->b_die;
+ vlc_object_internals_t *priv = vlc_internals( obj );
+ vlc_assert_locked( &priv->lock);
+ return vlc_cond_timedwait( &priv->wait, &priv->lock, deadline );
}
/**
* Signals an object for which the lock is held.
+ * At least one thread currently sleeping in vlc_object_wait() or
+ * vlc_object_timedwait() will wake up, assuming that there is at least one
+ * such thread in the first place. Otherwise, it is undefined whether the
+ * signal will be lost or will wake up one or more thread later.
*/
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) );
}
*/
void __vlc_object_kill( vlc_object_t *p_this )
{
- vlc_object_internals_t *internals = vlc_internals( p_this );
+ vlc_object_internals_t *priv = vlc_internals( p_this );
int fd;
- vlc_mutex_lock( &p_this->object_lock );
+ 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 < internals->i_children ; i++ )
- vlc_object_kill( internals->pp_children[i] );
-
vlc_object_signal_unlocked( p_this );
- vlc_mutex_unlock( &p_this->object_lock );
+ /* This also serves as a memory barrier toward vlc_object_alive(): */
+ vlc_object_unlock( p_this );
}
* vlc_object_yield(), use the pointer as your reference, and call
* vlc_object_release() when you're done.
*/
-void * vlc_object_get( int i_id )
+void * vlc_object_get( libvlc_int_t *p_anchor, int i_id )
{
- libvlc_global_data_t *p_libvlc_global = vlc_global();
vlc_object_t *obj = NULL;
-
+#ifndef NDEBUG
+ int canc = vlc_savecancel ();
+ fprintf (stderr, "Use of deprecated vlc_object_get(%d)\n", i_id);
+ vlc_restorecancel (canc);
+#endif
vlc_mutex_lock( &structure_lock );
- for( obj = vlc_internals (p_libvlc_global)->next;
- obj != VLC_OBJECT (p_libvlc_global);
+ for( obj = vlc_internals (p_anchor)->next;
+ obj != VLC_OBJECT (p_anchor);
obj = vlc_internals (obj)->next )
{
if( obj->i_object_id == i_id )
}
}
obj = NULL;
-
+#ifndef NDEBUG
+ fprintf (stderr, "Object %d does not exist\n", i_id);
+#endif
out:
vlc_mutex_unlock( &structure_lock );
return obj;
{
#ifndef NDEBUG
if (i_type == VLC_OBJECT_PLAYLIST)
- msg_Warn (p_this, "using vlc_object_find(VLC_OBJECT_PLAYLIST) "
- "instead of pl_Yield()");
+ 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);
}
/*****************************************************************************
- * 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 )
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);
}
}
INSERT_ELEM( priv->pp_children, priv->i_children, priv->i_children,
p_this );
- /* Kill the object if parent is already dead.
- * Note: We should surely lock parent here, but that would
- * create quite a few dead lock case. Hopefully, it
- * is perfectly safe to do it that way. We only risk
- * receiving kill event twice. But given current API
- * it is ok. */
- if( p_this->p_parent->b_die )
- vlc_object_kill( p_this );
-
vlc_mutex_unlock( &structure_lock );
}
* 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 *)vlc_global ()->p_module_bank,
+ 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);
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 *root = VLC_OBJECT (vlc_global ()), *cur = root;
+ vlc_object_t *cur = VLC_OBJECT (p_libvlc);
vlc_mutex_lock( &structure_lock );
do
PrintObject (cur, "");
cur = vlc_internals (cur)->next;
}
- while (cur != root);
+ while (cur != VLC_OBJECT(p_libvlc));
vlc_mutex_unlock( &structure_lock );
}
else
{
char *end;
int i_id = strtol( newval.psz_string, &end, 0 );
- if( end != newval.psz_string )
- p_object = vlc_object_get( i_id );
+ if( !*end )
+ p_object = vlc_object_get( p_libvlc, 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 );
- }
- }
+ p_object = vlc_object_find_name( p_this, newval.psz_string,
+ FIND_ANYWHERE );
if( !p_object )
{
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 );
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 )
char psz_children[20], psz_refcount[20], psz_thread[30], psz_name[50],
psz_parent[20];
+ int canc = vlc_savecancel ();
memset( &psz_name, 0, sizeof(psz_name) );
if( p_this->psz_object_name )
{
p_this->i_object_id, 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 )
ListChildren( p_list, p_tmp, i_type );
}
}
-
-#ifndef NDEBUG
-# ifdef __GLIBC__
-# include <execinfo.h>
-# endif
-
-void vlc_refcheck (vlc_object_t *obj)
-{
- static unsigned errors = 0;
- if (errors > 100)
- return;
-
- /* Anyone can use the root object (though it should not exist) */
- if (obj == VLC_OBJECT (vlc_global ()))
- return;
-
- /* Anyone can use its libvlc instance object */
- if (obj == VLC_OBJECT (obj->p_libvlc))
- return;
-
- /* The thread that created the object holds the initial reference */
- vlc_object_internals_t *priv = vlc_internals (obj);
-#if defined (LIBVLC_USE_PTHREAD)
- if (pthread_equal (priv->creator_id, pthread_self ()))
-#elif defined WIN32
- if (priv->creator_id == GetCurrentThreadId ())
-#else
- if (0)
-#endif
- return;
-
- /* A thread can use its own object without reference! */
- vlc_object_t *caller = vlc_threadobj ();
- if (caller == obj)
- return;
-
- /* The calling thread is younger than the object.
- * Access could be valid through cross-thread synchronization;
- * we would need better accounting. */
- if (caller && (caller->i_object_id > obj->i_object_id))
- return;
-
- int refs;
- vlc_spin_lock (&priv->ref_spin);
- refs = priv->i_refcount;
- vlc_spin_unlock (&priv->ref_spin);
-
- /* Object has more than one reference.
- * The current thread could be holding a valid reference. */
- if (refs > 1)
- return;
-
- fprintf (stderr, "The %s %s thread object is accessing...\n"
- "the %s %s object in a suspicous manner.\n",
- caller && caller->psz_object_name
- ? caller->psz_object_name : "unnamed",
- caller ? caller->psz_object_type : "main",
- obj->psz_object_name ? obj->psz_object_name : "unnamed",
- obj->psz_object_type);
- fflush (stderr);
-
-#ifdef __GLIBC__
- void *stack[20];
- int stackdepth = backtrace (stack, sizeof (stack) / sizeof (stack[0]));
- backtrace_symbols_fd (stack, stackdepth, 2);
-#endif
-
- if (++errors == 100)
- fprintf (stderr, "Too many reference errors!\n");
-}
-#endif
projects / vlc / blobdiff