/*****************************************************************************
* Local structure lock
*****************************************************************************/
-static vlc_mutex_t structure_lock;
-static unsigned object_counter = 0;
-
static void close_nocancel (int fd)
{
int canc = vlc_savecancel ();
vlc_restorecancel (canc);
}
+static void libvlc_lock (libvlc_int_t *p_libvlc)
+{
+ vlc_mutex_lock (&(libvlc_priv (p_libvlc)->structure_lock));
+}
+
+static void libvlc_unlock (libvlc_int_t *p_libvlc)
+{
+ vlc_mutex_unlock (&(libvlc_priv (p_libvlc)->structure_lock));
+}
+
void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
int i_type, const char *psz_type )
{
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;
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 );
- }
-
+ 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_priv->next = p_priv->prev = p_new;
}
else
/* Initialize mutexes and condvars */
vlc_mutex_init( &p_priv->lock );
- vlc_cond_init( p_new, &p_priv->wait );
+ 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;
- vlc_mutex_lock( &structure_lock );
+ libvlc_lock (p_new->p_libvlc);
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 );
+ libvlc_unlock (p_new->p_libvlc);
- 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 );
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;
}
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
-
vlc_spin_destroy( &p_priv->ref_spin );
vlc_mutex_destroy( &p_priv->lock );
vlc_cond_destroy( &p_priv->wait );
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 );
}
* @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 );
/**
- * Waits for the object to be signaled (using vlc_object_signal()).
- * 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.
+ * 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.
- *
- * @return true if the object is dying and should terminate.
*/
void __vlc_object_wait( vlc_object_t *obj )
{
/**
- * Waits for the object to be signaled (using vlc_object_signal()), or for
- * a timer to expire. It is asserted that the caller holds the object lock.
- *
- * This function is a cancellation point. In case of cancellation, the object
- * will be in locked state.
+ * Wakes up one thread waiting on the object. If no thread are (yet) waiting,
+ * nothing happens.
*
- * @return 0 if the object was signaled before the timer expiration, or
- * ETIMEDOUT if the timer expired without any signal.
- */
-int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
-{
- 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.
+ * 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 )
{
close_nocancel (fd);
}
- vlc_object_signal_unlocked( p_this );
+ 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.
- * 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( obj->i_object_id == i_id )
- {
- vlc_object_yield( obj );
- goto out;
- }
- }
- 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
/* 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( 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;
}
* 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.
*
&& p_this->psz_object_name
&& !strcmp( p_this->psz_object_name, 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 )
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 );
/* Increment the counter */
internals->i_refcount++;
vlc_spin_unlock( &internals->ref_spin );
+ return 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 );
/* 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;
if( b_should_destroy )
{
+ /* We have no children */
+ assert (internals->i_children == 0);
+ parent = p_this->p_parent;
+
#ifndef NDEBUG
if( VLC_OBJECT(p_this->p_libvlc) == 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,
+ "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 );
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;
+ if (parent)
+ /* Detach from parent to protect against FIND_CHILDREN */
+ vlc_object_detach_unlocked (p_this);
}
-
- 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);
}
}
{
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);
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;
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
{
*****************************************************************************/
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);
}
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);
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:
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;
}
{
vlc_object_t *cur = VLC_OBJECT (p_libvlc);
- vlc_mutex_lock( &structure_lock );
+ libvlc_lock (p_this->p_libvlc);
do
{
PrintObject (cur, "");
cur = vlc_internals (cur)->next;
}
while (cur != VLC_OBJECT(p_libvlc));
- vlc_mutex_unlock( &structure_lock );
+ libvlc_unlock (p_this->p_libvlc);
}
else
{
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 );
-
+ /* 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;
}
}
- vlc_mutex_lock( &structure_lock );
-
+ libvlc_lock (p_this->p_libvlc);
if( *psz_cmd == 't' )
{
char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
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:
printf( "\n" );
}
}
-
- vlc_mutex_unlock( &structure_lock );
+ libvlc_unlock (p_this->p_libvlc);
if( *newval.psz_string )
{
char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
psz_foo[0] = '|';
- vlc_assert_locked( &structure_lock );
DumpStructure( p_this, 0, psz_foo );
}
{
if( p_tmp->i_object_type == i_type )
{
- vlc_object_yield( p_tmp );
+ vlc_object_hold( p_tmp );
return p_tmp;
}
else
p_tmp = vlc_internals( p_this )->pp_children[i];
if( 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 )
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- vlc_object_yield( p_tmp );
+ vlc_object_hold( p_tmp );
return p_tmp;
}
else
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- vlc_object_yield( p_tmp );
+ vlc_object_hold( p_tmp );
return p_tmp;
}
else if( vlc_internals( p_tmp )->i_children )
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);
return;
}
- vlc_object_yield( p_object );
+ vlc_object_hold( p_object );
p_list->p_values[i_index].p_object = 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++;
projects / vlc / blobdiff