/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h> /* required */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <stdio.h> /* required */
#include "input/input_internal.h"
static int CounterUpdate( vlc_object_t *p_this,
counter_t *p_counter,
vlc_value_t val, vlc_value_t * );
-static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, vlc_bool_t);
+static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, bool);
/*****************************************************************************
* Exported functions
int i_type, int i_compute_type )
{
counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
+ (void)p_this;
+ if( !p_counter ) return NULL;
p_counter->i_compute_type = i_compute_type;
p_counter->i_type = i_type;
p_counter->i_samples = 0;
int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
vlc_value_t val, vlc_value_t *val_new )
{
- if( !p_this->p_libvlc->b_stats || !p_counter ) return VLC_EGENERIC;
+ if( !libvlc_stats (p_this) || !p_counter ) return VLC_EGENERIC;
return CounterUpdate( p_this, p_counter, val, val_new );
}
*/
int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
{
- if( !p_this->p_libvlc->b_stats || !p_counter || p_counter->i_samples == 0 )
+ if( !libvlc_stats (p_this) || !p_counter || p_counter->i_samples == 0 )
{
val->i_int = val->f_float = 0.0;
return VLC_EGENERIC;
return VLC_SUCCESS;;
}
+input_stats_t *stats_NewInputStats( input_thread_t *p_input )
+{
+ (void)p_input;
+ input_stats_t *p_stats = malloc( sizeof(input_stats_t) );
+
+ if( !p_stats )
+ return NULL;
+
+ memset( p_stats, 0, sizeof(*p_stats) );
+ vlc_mutex_init( &p_stats->lock );
+ stats_ReinitInputStats( p_stats );
+
+ return p_stats;
+}
+
void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *p_stats )
{
- if( !p_input->p_libvlc->b_stats ) return;
+ if( !libvlc_stats (p_input) ) return;
vlc_mutex_lock( &p_input->p->counters.counters_lock );
vlc_mutex_lock( &p_stats->lock );
vlc_list_t *p_list;
int i_index;
- if( !p_obj->p_libvlc->b_stats ) return;
+ if( !libvlc_stats (p_obj) ) return;
vlc_mutex_lock( &p_stats->lock );
void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
unsigned int i_id )
{
- int i;
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
counter_t *p_counter = NULL;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ if( !priv->b_stats ) return;
+
+ vlc_mutex_lock( &priv->timer_lock );
+
+ for( int i = 0 ; i < priv->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( priv->pp_timers[i]->i_id == i_id
+ && priv->pp_timers[i]->p_obj == p_obj )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = priv->pp_timers[i];
break;
}
}
if( !p_counter )
{
counter_sample_t *p_sample;
- p_counter = stats_CounterCreate( p_obj->p_libvlc_global, VLC_VAR_TIME,
+ p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME,
STATS_TIMER );
if( !p_counter )
- {
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
- return;
- }
+ goto out;
p_counter->psz_name = strdup( psz_name );
p_counter->i_id = i_id;
- INSERT_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers,
- p_obj->p_libvlc->i_timers, p_counter );
+ p_counter->p_obj = p_obj;
+ INSERT_ELEM( priv->pp_timers, priv->i_timers,
+ priv->i_timers, p_counter );
/* 1st sample : if started: start_date, else last_time, b_started */
p_sample = (counter_sample_t *)malloc( sizeof( counter_sample_t ) );
p_counter->i_samples, p_sample );
p_sample->date = 0; p_sample->value.i_int = 0;
}
- if( p_counter->pp_samples[0]->value.b_bool == VLC_TRUE )
+ if( p_counter->pp_samples[0]->value.b_bool == true )
{
- msg_Warn( p_obj, "timer %s was already started !", psz_name );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
- return;
+ msg_Warn( p_obj, "timer '%s' was already started !", psz_name );
+ goto out;
}
- p_counter->pp_samples[0]->value.b_bool = VLC_TRUE;
+ p_counter->pp_samples[0]->value.b_bool = true;
p_counter->pp_samples[0]->date = mdate();
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+out:
+ vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
- int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
+ if( !priv->b_stats ) return;
+ vlc_mutex_lock( &priv->timer_lock );
+ for( int i = 0 ; i < priv->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( priv->pp_timers[i]->i_id == i_id
+ && priv->pp_timers[i]->p_obj == p_obj )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = priv->pp_timers[i];
break;
}
}
if( !p_counter || p_counter->i_samples != 2 )
{
msg_Err( p_obj, "timer does not exist" );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
- return;
+ goto out;
}
- p_counter->pp_samples[0]->value.b_bool = VLC_FALSE;
+ p_counter->pp_samples[0]->value.b_bool = false;
p_counter->pp_samples[1]->value.i_int += 1;
p_counter->pp_samples[0]->date = mdate() - p_counter->pp_samples[0]->date;
p_counter->pp_samples[1]->date += p_counter->pp_samples[0]->date;
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+out:
+ vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
- int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
+ if( !priv->b_stats ) return;
+ vlc_mutex_lock( &priv->timer_lock );
+ for( int i = 0 ; i < priv->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( priv->pp_timers[i]->i_id == i_id
+ && priv->pp_timers[i]->p_obj == p_obj )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = priv->pp_timers[i];
break;
}
}
- TimerDump( p_obj, p_counter, VLC_TRUE );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ TimerDump( p_obj, p_counter, true );
+ vlc_mutex_unlock( &priv->timer_lock );
}
void __stats_TimersDumpAll( vlc_object_t *p_obj )
{
- int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for ( i = 0 ; i< p_obj->p_libvlc->i_timers ; i++ )
- TimerDump( p_obj, p_obj->p_libvlc->pp_timers[i], VLC_FALSE );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
+ if( !priv->b_stats ) return;
+ vlc_mutex_lock( &priv->timer_lock );
+ for ( int i = 0 ; i < priv->i_timers ; i++ )
+ TimerDump( p_obj, priv->pp_timers[i], false );
+ vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimersClean( vlc_object_t *p_obj )
+void __stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
{
- int i;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for ( i = p_obj->p_libvlc->i_timers -1 ; i >= 0; i-- )
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
+ vlc_mutex_lock( &priv->timer_lock );
+ for ( int i = priv->i_timers -1 ; i >= 0; i-- )
{
- counter_t *p_counter = p_obj->p_libvlc->pp_timers[i];
- REMOVE_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers, i );
+ counter_t *p_counter = priv->pp_timers[i];
+ if( p_counter->i_id == i_id && p_counter->p_obj == p_obj )
+ {
+ REMOVE_ELEM( priv->pp_timers, priv->i_timers, i );
+ stats_CounterClean( p_counter );
+ }
+ }
+ vlc_mutex_unlock( &priv->timer_lock );
+}
+
+void __stats_TimersCleanAll( vlc_object_t *p_obj )
+{
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+
+ vlc_mutex_lock( &priv->timer_lock );
+ for ( int i = priv->i_timers -1 ; i >= 0; i-- )
+ {
+ counter_t *p_counter = priv->pp_timers[i];
+ REMOVE_ELEM( priv->pp_timers, priv->i_timers, i );
stats_CounterClean( p_counter );
}
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &priv->timer_lock );
}
void stats_CounterClean( counter_t *p_c )
{
- int i;
if( p_c )
{
- i = p_c->i_samples - 1 ;
+ int i = p_c->i_samples - 1 ;
while( i >= 0 )
{
counter_sample_t *p_s = p_c->pp_samples[i];
free( p_s );
i--;
}
- if( p_c->psz_name ) free( p_c->psz_name );
+ free( p_c->psz_name );
free( p_c );
}
}
}
static void TimerDump( vlc_object_t *p_obj, counter_t *p_counter,
- vlc_bool_t b_total )
+ bool b_total )
{
+ if( !p_counter )
+ return;
+
mtime_t last, total;
int i_total;
- if( !p_counter || p_counter->i_samples != 2 )
+ if( p_counter->i_samples != 2 )
{
msg_Err( p_obj, "timer %s does not exist", p_counter->psz_name );
return;
}
i_total = p_counter->pp_samples[1]->value.i_int;
total = p_counter->pp_samples[1]->date;
- if( p_counter->pp_samples[0]->value.b_bool == VLC_TRUE )
+ if( p_counter->pp_samples[0]->value.b_bool == true )
{
last = mdate() - p_counter->pp_samples[0]->date;
i_total += 1;
projects / vlc / blobdiff