Commit 094cdf14 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

stats: remove leading underscores

parent ec562605
......@@ -203,19 +203,20 @@ enum
/*********
* Timing
********/
#define stats_TimerStart(a,b,c) __stats_TimerStart( VLC_OBJECT(a), b,c )
#define stats_TimerStop(a,b) __stats_TimerStop( VLC_OBJECT(a), b )
#define stats_TimerDump(a,b) __stats_TimerDump( VLC_OBJECT(a), b )
#define stats_TimersDumpAll(a) __stats_TimersDumpAll( VLC_OBJECT(a) )
VLC_EXPORT( void,__stats_TimerStart, (vlc_object_t*, const char *, unsigned int ) );
VLC_EXPORT( void,__stats_TimerStop, (vlc_object_t*, unsigned int) );
VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, unsigned int) );
VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) );
#define stats_TimersCleanAll(a) __stats_TimersCleanAll( VLC_OBJECT(a) )
VLC_EXPORT( void, __stats_TimersCleanAll, (vlc_object_t * ) );
#define stats_TimerClean(a,b) __stats_TimerClean( VLC_OBJECT(a), b )
VLC_EXPORT( void, __stats_TimerClean, (vlc_object_t *, unsigned int ) );
VLC_EXPORT( void, stats_TimerStart, (vlc_object_t*, const char *, unsigned int ) );
VLC_EXPORT( void, stats_TimerStop, (vlc_object_t*, unsigned int) );
VLC_EXPORT( void, stats_TimerDump, (vlc_object_t*, unsigned int) );
VLC_EXPORT( void, stats_TimersDumpAll, (vlc_object_t*) );
#define stats_TimerStart(a,b,c) stats_TimerStart( VLC_OBJECT(a), b,c )
#define stats_TimerStop(a,b) stats_TimerStop( VLC_OBJECT(a), b )
#define stats_TimerDump(a,b) stats_TimerDump( VLC_OBJECT(a), b )
#define stats_TimersDumpAll(a) stats_TimersDumpAll( VLC_OBJECT(a) )
VLC_EXPORT( void, stats_TimersCleanAll, (vlc_object_t * ) );
#define stats_TimersCleanAll(a) stats_TimersCleanAll( VLC_OBJECT(a) )
VLC_EXPORT( void, stats_TimerClean, (vlc_object_t *, unsigned int ) );
#define stats_TimerClean(a,b) stats_TimerClean( VLC_OBJECT(a), b )
/**
* @}
......
......@@ -245,40 +245,39 @@ void var_OptionParse (vlc_object_t *, const char *, bool trusted);
/*
* Stats stuff
*/
#define stats_Update(a,b,c) __stats_Update( VLC_OBJECT(a), b, c )
int __stats_Update (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *);
#define stats_CounterCreate(a,b,c) __stats_CounterCreate( VLC_OBJECT(a), b, c )
counter_t * __stats_CounterCreate (vlc_object_t*, int, int);
#define stats_Get(a,b,c) __stats_Get( VLC_OBJECT(a), b, c)
int __stats_Get (vlc_object_t*, counter_t *, vlc_value_t*);
int stats_Update (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *);
counter_t * stats_CounterCreate (vlc_object_t*, int, int);
#define stats_CounterCreate(a,b,c) stats_CounterCreate( VLC_OBJECT(a), b, c )
int stats_Get (vlc_object_t*, counter_t *, vlc_value_t*);
#define stats_Get(a,b,c) stats_Get( VLC_OBJECT(a), b, c)
void stats_CounterClean (counter_t * );
#define stats_GetInteger(a,b,c) __stats_GetInteger( VLC_OBJECT(a), b, c )
static inline int __stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter,
int *value )
static inline int stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter,
int *value )
{
int i_ret;
vlc_value_t val; val.i_int = 0;
if( !p_counter ) return VLC_EGENERIC;
i_ret = __stats_Get( p_obj, p_counter, &val );
i_ret = stats_Get( p_obj, p_counter, &val );
*value = val.i_int;
return i_ret;
}
#define stats_GetInteger(a,b,c) stats_GetInteger( VLC_OBJECT(a), b, c )
#define stats_GetFloat(a,b,c) __stats_GetFloat( VLC_OBJECT(a), b, c )
static inline int __stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter,
static inline int stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter,
float *value )
{
int i_ret;
vlc_value_t val; val.f_float = 0.0;
if( !p_counter ) return VLC_EGENERIC;
i_ret = __stats_Get( p_obj, p_counter, &val );
i_ret = stats_Get( p_obj, p_counter, &val );
*value = val.f_float;
return i_ret;
}
#define stats_UpdateInteger(a,b,c,d) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
static inline int __stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co,
#define stats_GetFloat(a,b,c) stats_GetFloat( VLC_OBJECT(a), b, c )
static inline int stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co,
int i, int *pi_new )
{
int i_ret;
......@@ -286,13 +285,14 @@ static inline int __stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co,
vlc_value_t new_val; new_val.i_int = 0;
if( !p_co ) return VLC_EGENERIC;
val.i_int = i;
i_ret = __stats_Update( p_obj, p_co, val, &new_val );
i_ret = stats_Update( p_obj, p_co, val, &new_val );
if( pi_new )
*pi_new = new_val.i_int;
return i_ret;
}
#define stats_UpdateFloat(a,b,c,d) __stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
static inline int __stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co,
#define stats_UpdateInteger(a,b,c,d) stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
static inline int stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co,
float f, float *pf_new )
{
vlc_value_t val;
......@@ -300,11 +300,12 @@ static inline int __stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co,
vlc_value_t new_val;new_val.f_float = 0.0;
if( !p_co ) return VLC_EGENERIC;
val.f_float = f;
i_ret = __stats_Update( p_obj, p_co, val, &new_val );
i_ret = stats_Update( p_obj, p_co, val, &new_val );
if( pf_new )
*pf_new = new_val.f_float;
return i_ret;
}
#define stats_UpdateFloat(a,b,c,d) stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) );
VLC_EXPORT( void, stats_ReinitInputStats, (input_stats_t *) );
......
......@@ -387,12 +387,12 @@ spu_RenderSubpictures
spu_SortSubpictures
sql_Create
sql_Destroy
__stats_TimerClean
__stats_TimerDump
__stats_TimersCleanAll
__stats_TimersDumpAll
__stats_TimerStart
__stats_TimerStop
stats_TimerClean
stats_TimerDump
stats_TimersCleanAll
stats_TimersDumpAll
stats_TimerStart
stats_TimerStop
stream_Block
stream_Control
stream_Delete
......
......@@ -46,6 +46,7 @@ static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, bool);
* Exported functions
*****************************************************************************/
#undef stats_CounterCreate
/**
* Create a statistics counter
* \param p_this a VLC object
......@@ -56,7 +57,7 @@ static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, bool);
* STATS_MAX (keep the maximum passed value), STATS_MIN, or STATS_DERIVATIVE
* (keep a time derivative of the value)
*/
counter_t * __stats_CounterCreate( vlc_object_t *p_this,
counter_t * stats_CounterCreate( vlc_object_t *p_this,
int i_type, int i_compute_type )
{
counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
......@@ -79,16 +80,17 @@ counter_t * __stats_CounterCreate( vlc_object_t *p_this,
* \param p_this a VLC object
* \param p_counter the counter to update
* \param val the vlc_value union containing the new value to aggregate. For
* more information on how data is aggregated, \see __stats_Create
* more information on how data is aggregated, \see stats_Create
* \param val_new a pointer that will be filled with new data
*/
int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
vlc_value_t val, vlc_value_t *val_new )
int stats_Update( vlc_object_t *p_this, counter_t *p_counter,
vlc_value_t val, vlc_value_t *val_new )
{
if( !libvlc_stats (p_this) || !p_counter ) return VLC_EGENERIC;
return CounterUpdate( p_this, p_counter, val, val_new );
}
#undef stats_Get
/** Get the aggregated value for a counter
* \param p_this an object
* \param p_counter the counter
......@@ -96,7 +98,7 @@ int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
* retrieved value
* \return an error code
*/
int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
int stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
{
if( !libvlc_stats (p_this) || !p_counter || p_counter->i_samples == 0 )
{
......@@ -243,8 +245,9 @@ void stats_DumpInputStats( input_stats_t *p_stats )
vlc_mutex_unlock( &p_stats->lock );
}
void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
unsigned int i_id )
#undef stats_TimerStart
void stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
unsigned int i_id )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
counter_t *p_counter = NULL;
......@@ -265,8 +268,8 @@ void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
if( !p_counter )
{
counter_sample_t *p_sample;
p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME,
STATS_TIMER );
p_counter = stats_CounterCreate( VLC_OBJECT(p_obj->p_libvlc),
VLC_VAR_TIME, STATS_TIMER );
if( !p_counter )
goto out;
p_counter->psz_name = strdup( psz_name );
......@@ -297,7 +300,8 @@ out:
vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
#undef stats_TimerStop
void stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
......@@ -326,7 +330,8 @@ out:
vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
#undef stats_TimerDump
void stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
......@@ -346,7 +351,8 @@ void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimersDumpAll( vlc_object_t *p_obj )
#undef stats_TimersDumpAll
void stats_TimersDumpAll( vlc_object_t *p_obj )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
......@@ -357,7 +363,8 @@ void __stats_TimersDumpAll( vlc_object_t *p_obj )
vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
#undef stats_TimerClean
void stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
......@@ -374,7 +381,8 @@ void __stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimersCleanAll( vlc_object_t *p_obj )
#undef stats_TimersCleanAll
void stats_TimersCleanAll( vlc_object_t *p_obj )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment