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;
/* 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_spin_init( &p_priv->spin );
p_priv->pipes[0] = p_priv->pipes[1] = -1;
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;
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 );
/**
- * 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.
+ * Wakes up one thread waiting on the object. If no thread are (yet) waiting,
+ * nothing happens.
*
- * This function is a cancellation point. In case of cancellation, the object
- * will be in locked state.
- *
- * @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
* 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.
*
{
/* 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 );
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
{
{
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;
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:
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);
projects / vlc / blobdiff