vlc_mutex_unlock( &structure_lock );
}
- p_new->i_refcount = 0;
+ p_priv->i_refcount = 0;
p_new->p_parent = NULL;
p_new->pp_children = NULL;
p_new->i_children = 0;
i_size = sizeof( vod_t );
psz_type = "vod server";
break;
- case VLC_OBJECT_TLS:
- i_size = sizeof( tls_t );
- psz_type = "tls";
- break;
case VLC_OBJECT_XML:
i_size = sizeof( xml_t );
psz_type = "xml";
return;
}
- while( p_this->i_refcount )
+ while( p_priv->i_refcount > 0 )
{
i_delay++;
if( i_delay == 2 )
{
msg_Warn( p_this,
- "refcount is %i, delaying before deletion (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
+ "refcount is %u, delaying before deletion (id=%d,type=%d)",
+ p_priv->i_refcount, p_this->i_object_id,
p_this->i_object_type );
}
else if( i_delay == 10 )
{
msg_Err( p_this,
- "refcount is %i, delaying again (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
+ "refcount is %u, delaying again (id=%d,type=%d)",
+ p_priv->i_refcount, p_this->i_object_id,
p_this->i_object_type );
}
else if( i_delay == 20 )
}
-void __vlc_object_kill( vlc_object_t *p_this )
+/** Inter-object signaling */
+
+void __vlc_object_lock( vlc_object_t *obj )
{
- vlc_mutex_lock( &p_this->object_lock );
- p_this->b_die = VLC_TRUE;
- vlc_mutex_unlock( &p_this->object_lock );
+ vlc_mutex_lock( &obj->object_lock );
}
+void __vlc_object_unlock( vlc_object_t *obj )
+{
+ vlc_assert_locked( &obj->object_lock );
+ vlc_mutex_unlock( &obj->object_lock );
+}
-vlc_bool_t __vlc_object_dying_unlocked( vlc_object_t *p_this )
+/**
+ * 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.
+ *
+ * @return true if the object is dying and should terminate.
+ */
+vlc_bool_t __vlc_object_wait( vlc_object_t *obj )
{
- vlc_assert_locked( &p_this->object_lock );
- return p_this->b_die;
+ vlc_assert_locked( &obj->object_lock );
+ vlc_cond_wait( &obj->object_wait, &obj->object_lock );
+ return obj->b_die;
}
-vlc_bool_t __vlc_object_dying( vlc_object_t *p_this )
+/**
+ * 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 )
{
- vlc_bool_t b;
- vlc_mutex_lock( &p_this->object_lock );
- b = __vlc_object_dying_unlocked( p_this );
- vlc_mutex_unlock( &p_this->object_lock );
- return b;
+ 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;
+}
+
+
+/**
+ * Signals an object for which the lock is held.
+ */
+void __vlc_object_signal_unlocked( vlc_object_t *obj )
+{
+ vlc_assert_locked( &obj->object_lock );
+ vlc_cond_signal( &obj->object_wait );
+}
+
+
+/**
+ * Requests termination of an object.
+ * If the object is LibVLC, also request to terminate all its children.
+ */
+void __vlc_object_kill( vlc_object_t *p_this )
+{
+ vlc_mutex_lock( &p_this->object_lock );
+
+ if( p_this->i_object_type == VLC_OBJECT_LIBVLC )
+ for( int i = 0; i < p_this->i_children ; i++ )
+ vlc_object_kill( p_this->pp_children[i] );
+
+ p_this->b_die = VLC_TRUE;
+ vlc_object_signal_unlocked( p_this );
+ vlc_mutex_unlock( &p_this->object_lock );
}
if( pp_objects[i_middle+1]->i_object_id == i_id )
{
vlc_mutex_unlock( &structure_lock );
- pp_objects[i_middle+1]->i_refcount++;
+ pp_objects[i_middle+1]->p_internals->i_refcount++;
return pp_objects[i_middle+1];
}
break;
else
{
vlc_mutex_unlock( &structure_lock );
- pp_objects[i_middle]->i_refcount++;
+ pp_objects[i_middle]->p_internals->i_refcount++;
return pp_objects[i_middle];
}
/* If we are of the requested type ourselves, don't look further */
if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type )
{
- p_this->i_refcount++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
&& p_this->psz_object_name
&& !strcmp( p_this->psz_object_name, psz_name ) )
{
- p_this->i_refcount++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
void __vlc_object_yield( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
- p_this->i_refcount++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
}
-/**
- ****************************************************************************
+static inline void Release( vlc_object_t *obj )
+{
+ assert( obj->p_internals->i_refcount > 0 );
+ obj->p_internals->i_refcount--;
+}
+
+/*****************************************************************************
* decrement an object refcount
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
- p_this->i_refcount--;
+ Release( p_this );
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_lock( &structure_lock );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- p_list->p_values[i_index].p_object->i_refcount--;
+ Release( p_list->p_values[i_index].p_object );
}
vlc_mutex_unlock( &structure_lock );
{
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else
p_tmp = p_this->pp_children[i];
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
}
psz_refcount[0] = '\0';
- if( p_this->i_refcount )
- snprintf( psz_refcount, 19, ", refcount %i", p_this->i_refcount );
+ if( p_this->p_internals->i_refcount > 0 )
+ snprintf( psz_refcount, 19, ", refcount %u",
+ p_this->p_internals->i_refcount );
psz_thread[0] = '\0';
if( p_this->p_internals->b_thread )
return;
}
- p_object->i_refcount++;
+ p_object->p_internals->i_refcount++;
p_list->p_values[i_index].p_object = p_object;
return;
}
- p_object->i_refcount++;
+ p_object->p_internals->i_refcount++;
p_list->p_values[p_list->i_count].p_object = p_object;
p_list->i_count++;