/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h> /* required */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <stdio.h> /* required */
+
+#include "input/input_internal.h"
/*****************************************************************************
* Local prototypes
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
counter_t * __stats_CounterCreate( vlc_object_t *p_this,
int i_type, int i_compute_type )
{
- counter_t *p_counter;
- if( !p_this->p_libvlc->b_stats ) return NULL;
-
- p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
+ 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 ) return VLC_EGENERIC;
+ if( !p_this->p_libvlc->b_stats || !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 ) return VLC_EGENERIC;
-
- if( p_counter->i_samples == 0 )
+ if( !p_this->p_libvlc->b_stats || !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_input, &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;
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
vlc_mutex_lock( &p_stats->lock );
/* Input */
- stats_GetInteger( p_input, p_input->counters.p_read_packets,
+ stats_GetInteger( p_input, p_input->p->counters.p_read_packets,
&p_stats->i_read_packets );
- stats_GetInteger( p_input, p_input->counters.p_read_bytes,
+ stats_GetInteger( p_input, p_input->p->counters.p_read_bytes,
&p_stats->i_read_bytes );
- stats_GetFloat( p_input, p_input->counters.p_input_bitrate,
+ stats_GetFloat( p_input, p_input->p->counters.p_input_bitrate,
&p_stats->f_input_bitrate );
- stats_GetInteger( p_input, p_input->counters.p_demux_read,
+ stats_GetInteger( p_input, p_input->p->counters.p_demux_read,
&p_stats->i_demux_read_bytes );
- stats_GetFloat( p_input, p_input->counters.p_demux_bitrate,
+ stats_GetFloat( p_input, p_input->p->counters.p_demux_bitrate,
&p_stats->f_demux_bitrate );
/* Decoders */
- stats_GetInteger( p_input, p_input->counters.p_decoded_video,
+ stats_GetInteger( p_input, p_input->p->counters.p_decoded_video,
&p_stats->i_decoded_video );
- stats_GetInteger( p_input, p_input->counters.p_decoded_audio,
+ stats_GetInteger( p_input, p_input->p->counters.p_decoded_audio,
&p_stats->i_decoded_audio );
/* Sout */
- if( p_input->counters.p_sout_send_bitrate )
+ if( p_input->p->counters.p_sout_send_bitrate )
{
- stats_GetInteger( p_input, p_input->counters.p_sout_sent_packets,
+ stats_GetInteger( p_input, p_input->p->counters.p_sout_sent_packets,
&p_stats->i_sent_packets );
- stats_GetInteger( p_input, p_input->counters.p_sout_sent_bytes,
+ stats_GetInteger( p_input, p_input->p->counters.p_sout_sent_bytes,
&p_stats->i_sent_bytes );
- stats_GetFloat ( p_input, p_input->counters.p_sout_send_bitrate,
+ stats_GetFloat ( p_input, p_input->p->counters.p_sout_send_bitrate,
&p_stats->f_send_bitrate );
}
/* Aout */
- stats_GetInteger( p_input, p_input->counters.p_played_abuffers,
+ stats_GetInteger( p_input, p_input->p->counters.p_played_abuffers,
&p_stats->i_played_abuffers );
- stats_GetInteger( p_input, p_input->counters.p_lost_abuffers,
+ stats_GetInteger( p_input, p_input->p->counters.p_lost_abuffers,
&p_stats->i_lost_abuffers );
/* Vouts */
- stats_GetInteger( p_input, p_input->counters.p_displayed_pictures,
+ stats_GetInteger( p_input, p_input->p->counters.p_displayed_pictures,
&p_stats->i_displayed_pictures );
- stats_GetInteger( p_input, p_input->counters.p_lost_pictures,
+ stats_GetInteger( p_input, p_input->p->counters.p_lost_pictures,
&p_stats->i_lost_pictures );
vlc_mutex_unlock( &p_stats->lock );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
}
void stats_ReinitInputStats( input_stats_t *p_stats )
{
+ vlc_mutex_lock( &p_stats->lock );
p_stats->i_read_packets = p_stats->i_read_bytes =
p_stats->f_input_bitrate = p_stats->f_average_input_bitrate =
p_stats->i_demux_read_packets = p_stats->i_demux_read_bytes =
p_stats->i_decoded_video = p_stats->i_decoded_audio =
p_stats->i_sent_bytes = p_stats->i_sent_packets = p_stats->f_send_bitrate
= 0;
+ vlc_mutex_unlock( &p_stats->lock );
}
void stats_DumpInputStats( input_stats_t *p_stats )
float f_in = 0, f_out = 0, f_demux = 0;
input_thread_t *p_input = (input_thread_t *)
p_list->p_values[i_index].p_object;
- stats_GetFloat( p_obj, p_input->counters.p_input_bitrate, &f_in );
- if( p_input->counters.p_sout_send_bitrate )
- stats_GetFloat( p_obj, p_input->counters.p_sout_send_bitrate,
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_GetFloat( p_obj, p_input->p->counters.p_input_bitrate, &f_in );
+ if( p_input->p->counters.p_sout_send_bitrate )
+ stats_GetFloat( p_obj, p_input->p->counters.p_sout_send_bitrate,
&f_out );
- stats_GetFloat( p_obj, p_input->counters.p_demux_bitrate,
+ stats_GetFloat( p_obj, p_input->p->counters.p_demux_bitrate,
&f_demux );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
f_total_in += f_in; f_total_out += f_out;f_total_demux += f_demux;
}
p_stats->f_input_bitrate = f_total_in;
vlc_mutex_unlock( &p_stats->lock );
}
-void stats_ReinitGlobalStats( global_stats_t *p_stats )
-{
- p_stats->f_input_bitrate = p_stats->f_output_bitrate = 0.0;
-}
-
-
void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
unsigned int i_id )
{
for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id
+ && p_obj->p_libvlc->pp_timers[i]->p_obj == p_obj )
{
p_counter = p_obj->p_libvlc->pp_timers[i];
break;
counter_sample_t *p_sample;
p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME,
STATS_TIMER );
- if( !p_counter ) return;
+ if( !p_counter )
+ {
+ vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ return;
+ }
p_counter->psz_name = strdup( psz_name );
p_counter->i_id = i_id;
+ p_counter->p_obj = p_obj;
INSERT_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers,
p_obj->p_libvlc->i_timers, p_counter );
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 );
+ msg_Warn( p_obj, "timer '%s' was already started !", psz_name );
+ vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
return;
}
- 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 );
}
vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id
+ && p_obj->p_libvlc->pp_timers[i]->p_obj == p_obj )
{
p_counter = p_obj->p_libvlc->pp_timers[i];
break;
vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
return;
}
- 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_lock( &p_obj->p_libvlc->timer_lock );
for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id
+ && p_obj->p_libvlc->pp_timers[i]->p_obj == p_obj )
{
p_counter = p_obj->p_libvlc->pp_timers[i];
break;
}
}
- TimerDump( p_obj, p_counter, VLC_TRUE );
+ TimerDump( p_obj, p_counter, true );
vlc_mutex_unlock( &p_obj->p_libvlc->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 );
+ TimerDump( p_obj, p_obj->p_libvlc->pp_timers[i], false );
+ vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+}
+
+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-- )
+ {
+ counter_t *p_counter = p_obj->p_libvlc->pp_timers[i];
+ if( p_counter->i_id == i_id && p_counter->p_obj == p_obj )
+ {
+ REMOVE_ELEM( p_obj->p_libvlc->pp_timers,
+ p_obj->p_libvlc->i_timers, i );
+ stats_CounterClean( p_counter );
+ }
+ }
vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
}
-void __stats_TimersClean( vlc_object_t *p_obj )
+void __stats_TimersCleanAll( vlc_object_t *p_obj )
{
int i;
vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
int i;
if( p_c )
{
- for( i = p_c->i_samples - 1 ; i >= 0 ; i-- )
+ i = p_c->i_samples - 1 ;
+ while( i >= 0 )
{
counter_sample_t *p_s = p_c->pp_samples[i];
REMOVE_ELEM( p_c->pp_samples, p_c->i_samples, i );
free( p_s );
+ i--;
}
- if( p_c->psz_name ) free( p_c->psz_name );
- free( p_c );
+ 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 )
{
mtime_t last, total;
int i_total;
}
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