Good news is, no plugins used it anyway.
Bad news is, some parts of libvlc still use which is wrong (i_refcount is protected by the "structure lock", meaning only misc/objects.c functions can use it safely).
/* Stuff related to the libvlc structure */ \
libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \
\
/* Stuff related to the libvlc structure */ \
libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \
\
- volatile int i_refcount; /**< usage count */ \
vlc_object_t * p_parent; /**< our parent */ \
vlc_object_t ** pp_children; /**< our children */ \
volatile int i_children; \
vlc_object_t * p_parent; /**< our parent */ \
vlc_object_t ** pp_children; /**< our children */ \
volatile int i_children; \
/* release for previous vlc_object_get */
vlc_object_release( p_input_thread );
/* release for previous vlc_object_get */
vlc_object_release( p_input_thread );
- should_destroy = p_input_thread->i_refcount == 1;
+ should_destroy = p_input_thread->p_internals->i_refcount == 1;
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
vlc_object_release( p_vlm );
vlc_object_release( p_vlm );
- if( p_vlm->i_refcount > 0 )
+ if( p_vlm->p_internals->i_refcount > 0 )
{
vlc_mutex_unlock( lockval.p_address );
return;
{
vlc_mutex_unlock( lockval.p_address );
return;
vlc_bool_t b_thread;
/* Objects management */
vlc_bool_t b_thread;
/* Objects management */
vlc_bool_t b_attached;
};
vlc_bool_t b_attached;
};
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_unlock( &structure_lock );
}
+ p_priv->i_refcount = 0;
p_new->p_parent = NULL;
p_new->pp_children = NULL;
p_new->i_children = 0;
p_new->p_parent = NULL;
p_new->pp_children = NULL;
p_new->i_children = 0;
- while( p_this->i_refcount )
+ while( p_priv->i_refcount > 0 )
if( i_delay == 2 )
{
msg_Warn( p_this,
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,
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 )
p_this->i_object_type );
}
else if( i_delay == 20 )
if( pp_objects[i_middle+1]->i_object_id == i_id )
{
vlc_mutex_unlock( &structure_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;
return pp_objects[i_middle+1];
}
break;
else
{
vlc_mutex_unlock( &structure_lock );
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];
}
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 )
{
/* 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->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
vlc_mutex_unlock( &structure_lock );
return p_this;
}
&& p_this->psz_object_name
&& !strcmp( p_this->psz_object_name, psz_name ) )
{
&& p_this->psz_object_name
&& !strcmp( p_this->psz_object_name, psz_name ) )
{
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
vlc_mutex_unlock( &structure_lock );
return p_this;
}
void __vlc_object_yield( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
void __vlc_object_yield( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
}
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 );
* decrement an object refcount
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_lock( &structure_lock );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
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 );
}
vlc_mutex_unlock( &structure_lock );
{
if( p_tmp->i_object_type == i_type )
{
{
if( p_tmp->i_object_type == i_type )
{
+ p_tmp->p_internals->i_refcount++;
p_tmp = p_this->pp_children[i];
if( p_tmp->i_object_type == i_type )
{
p_tmp = p_this->pp_children[i];
if( p_tmp->i_object_type == i_type )
{
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
return p_tmp;
}
else if( p_tmp->i_children )
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
+ p_tmp->p_internals->i_refcount++;
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
return p_tmp;
}
else if( p_tmp->i_children )
}
psz_refcount[0] = '\0';
}
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 )
psz_thread[0] = '\0';
if( p_this->p_internals->b_thread )
- p_object->i_refcount++;
+ p_object->p_internals->i_refcount++;
p_list->p_values[i_index].p_object = p_object;
p_list->p_values[i_index].p_object = p_object;
- 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++;
p_list->p_values[p_list->i_count].p_object = p_object;
p_list->i_count++;
#include <vlc/vlc.h>
#include <vlc_keys.h>
#include <vlc_osd.h>
#include <vlc/vlc.h>
#include <vlc_keys.h>
#include <vlc_osd.h>
vlc_mutex_lock( lockval.p_address );
vlc_object_release( p_osd );
vlc_mutex_lock( lockval.p_address );
vlc_object_release( p_osd );
- if( p_osd->i_refcount > 0 )
+ if( p_osd->p_internals->i_refcount > 0 )
{
vlc_mutex_unlock( lockval.p_address );
return;
{
vlc_mutex_unlock( lockval.p_address );
return;