X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fstats.c;h=db0d13d6609bc6c530db9c4978e79f96a3c2aaa2;hb=62dd14548820fb0966e6b90d586183f74a427e4b;hp=30bf4d59d331eb64762dbca0987385b1380b254d;hpb=7b52fc6ca75b7e747972e752e785829b19a3c07d;p=vlc diff --git a/src/misc/stats.c b/src/misc/stats.c index 30bf4d59d3..db0d13d660 100644 --- a/src/misc/stats.c +++ b/src/misc/stats.c @@ -4,7 +4,7 @@ * Copyright (C) 2006 the VideoLAN team * $Id$ * - * Authors: Clément Stenac + * Authors: Clément Stenac * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,57 +24,31 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include /* required */ -#include -#include +#include "input/input_internal.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static counter_t *GetCounter( stats_handler_t *p_handler, int i_object_id, - const char *psz_name ); -static int stats_CounterUpdate( stats_handler_t *p_handler, - counter_t *p_counter, - vlc_value_t val ); -static stats_handler_t* stats_HandlerCreate( vlc_object_t *p_this ); -static stats_handler_t *stats_HandlerGet( vlc_object_t *p_this ); - -static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, vlc_bool_t); +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, bool); /***************************************************************************** * Exported functions *****************************************************************************/ -/** - * Cleanup statistics handler stuff - * \param p_stats the handler to clean - * \return nothing - */ -void stats_HandlerDestroy( stats_handler_t *p_stats ) -{ - int i; - for ( i = p_stats->i_counters - 1 ; i >= 0 ; i-- ) - { - int j; - counter_t * p_counter = p_stats->pp_counters[i]; - - for( j = p_counter->i_samples -1; j >= 0 ; j-- ) - { - counter_sample_t *p_sample = p_counter->pp_samples[j]; - REMOVE_ELEM( p_counter->pp_samples, p_counter->i_samples, j ); - free( p_sample ); - } - free( p_counter->psz_name ); - REMOVE_ELEM( p_stats->pp_counters, p_stats->i_counters, i ); - free( p_counter ); - } -} - /** * Create a statistics counter - * \param p_this the object for which to create the counter - * \param psz_name the name + * \param p_this a VLC object * \param i_type the type of stored data. One of VLC_VAR_STRING, * VLC_VAR_INTEGER, VLC_VAR_FLOAT * \param i_compute_type the aggregation type. One of STATS_LAST (always @@ -82,118 +56,50 @@ void stats_HandlerDestroy( stats_handler_t *p_stats ) * STATS_MAX (keep the maximum passed value), STATS_MIN, or STATS_DERIVATIVE * (keep a time derivative of the value) */ -int __stats_Create( vlc_object_t *p_this, const char *psz_name, int i_type, - int i_compute_type ) +counter_t * __stats_CounterCreate( vlc_object_t *p_this, + int i_type, int i_compute_type ) { - counter_t *p_counter; - stats_handler_t *p_handler; - - if( p_this->p_libvlc->b_stats == VLC_FALSE ) - { - return VLC_EGENERIC; - } - p_handler = stats_HandlerGet( p_this ); - if( !p_handler ) return VLC_ENOMEM; - - vlc_mutex_lock( &p_handler->object_lock ); + counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ; + (void)p_this; - p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ; - - p_counter->psz_name = strdup( psz_name ); - p_counter->i_source_object = p_this->i_object_id; + if( !p_counter ) return NULL; p_counter->i_compute_type = i_compute_type; p_counter->i_type = i_type; p_counter->i_samples = 0; p_counter->pp_samples = NULL; + p_counter->psz_name = NULL; p_counter->update_interval = 0; p_counter->last_update = 0; - INSERT_ELEM( p_handler->pp_counters, - p_handler->i_counters, - p_handler->i_counters, - p_counter ); - - vlc_mutex_unlock( &p_handler->object_lock ); - - return VLC_SUCCESS; + return p_counter; } /** Update a counter element with new values - * \param p_this the object in which to update - * \param psz_name the name + * \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 + * \param val_new a pointer that will be filled with new data */ -int __stats_Update( vlc_object_t *p_this, const char *psz_name, - vlc_value_t val ) +int __stats_Update( vlc_object_t *p_this, counter_t *p_counter, + vlc_value_t val, vlc_value_t *val_new ) { - int i_ret; - counter_t *p_counter; - - /* Get stats handler singleton */ - stats_handler_t *p_handler; - if( p_this->p_libvlc->b_stats == VLC_FALSE ) - { - return VLC_EGENERIC; - } - p_handler = stats_HandlerGet( p_this ); - if( !p_handler ) return VLC_ENOMEM; - - vlc_mutex_lock( &p_handler->object_lock ); - /* Look for existing element */ - p_counter = GetCounter( p_handler, p_this->i_object_id, - psz_name ); - if( !p_counter ) - { - vlc_mutex_unlock( &p_handler->object_lock ); - vlc_object_release( p_handler ); - return VLC_ENOOBJ; - } - - i_ret = stats_CounterUpdate( p_handler, p_counter, val ); - vlc_mutex_unlock( &p_handler->object_lock ); - - return i_ret; + if( !libvlc_stats (p_this) || !p_counter ) return VLC_EGENERIC; + return CounterUpdate( p_this, p_counter, val, val_new ); } /** Get the aggregated value for a counter * \param p_this an object - * \param i_object_id the object id from which we want the data - * \param psz_name the name of the couner + * \param p_counter the counter * \param val a pointer to an initialized vlc_value union. It will contain the * retrieved value * \return an error code */ -int __stats_Get( vlc_object_t *p_this, int i_object_id, - const char *psz_name, vlc_value_t *val ) +int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val ) { - counter_t *p_counter; - - /* Get stats handler singleton */ - stats_handler_t *p_handler; - if( p_this->p_libvlc->b_stats == VLC_FALSE ) + if( !libvlc_stats (p_this) || !p_counter || p_counter->i_samples == 0 ) { - return VLC_EGENERIC; - } - p_handler = stats_HandlerGet( p_this ); - if( !p_handler ) return VLC_ENOMEM; - vlc_mutex_lock( &p_handler->object_lock ); - - /* Look for existing element */ - p_counter = GetCounter( p_handler, i_object_id, - psz_name ); - if( !p_counter ) - { - vlc_mutex_unlock( &p_handler->object_lock ); - vlc_object_release( p_handler ); - val->i_int = val->f_float = 0.0; - return VLC_ENOOBJ; - } - - if( p_counter->i_samples == 0 ) - { - vlc_mutex_unlock( &p_handler->object_lock ); val->i_int = val->f_float = 0.0; return VLC_EGENERIC; } @@ -210,7 +116,6 @@ int __stats_Get( vlc_object_t *p_this, int i_object_id, /* Not ready yet */ if( p_counter->i_samples < 2 ) { - vlc_mutex_unlock( &p_handler->object_lock ); val->i_int = 0; val->f_float = 0.0; return VLC_EGENERIC; } @@ -232,109 +137,79 @@ int __stats_Get( vlc_object_t *p_this, int i_object_id, } break; } - vlc_object_release( p_handler ); - - vlc_mutex_unlock( &p_handler->object_lock ); return VLC_SUCCESS;; } -/** Get a statistics counter structure. This allows for low-level modifications - * \param p_this a parent object - * \param i_object_id the object from which to retrieve data - * \param psz_name the name - * \return the counter, or NULL if not found (or handler not created yet) - */ -counter_t *__stats_CounterGet( vlc_object_t *p_this, int i_object_id, - const char *psz_name ) +input_stats_t *stats_NewInputStats( input_thread_t *p_input ) { - counter_t *p_counter; + (void)p_input; + input_stats_t *p_stats = malloc( sizeof(input_stats_t) ); - stats_handler_t *p_handler; - if( p_this->p_libvlc->b_stats == VLC_FALSE ) - { + if( !p_stats ) return NULL; - } - p_handler = stats_HandlerGet( p_this ); - if( !p_handler ) return NULL; - vlc_mutex_lock( &p_handler->object_lock ); + memset( p_stats, 0, sizeof(*p_stats) ); + vlc_mutex_init( &p_stats->lock ); + stats_ReinitInputStats( p_stats ); - /* Look for existing element */ - p_counter = GetCounter( p_handler, i_object_id, - psz_name ); - vlc_mutex_unlock( &p_handler->object_lock ); - vlc_object_release( p_handler ); - - return p_counter; + return p_stats; } - -void stats_ComputeInputStats( input_thread_t *p_input, - input_stats_t *p_stats ) +void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *p_stats ) { - vlc_object_t *p_obj; - vlc_list_t *p_list; - int i_index; + if( !libvlc_stats (p_input) ) return; + + vlc_mutex_lock( &p_input->p->counters.counters_lock ); vlc_mutex_lock( &p_stats->lock ); /* Input */ - stats_GetInteger( p_input, p_input->i_object_id, "read_packets", - &p_stats->i_read_packets ); - stats_GetInteger( p_input, p_input->i_object_id, "read_bytes", - &p_stats->i_read_bytes ); - stats_GetFloat( p_input, p_input->i_object_id, "input_bitrate", - &p_stats->f_input_bitrate ); - - stats_GetInteger( p_input, p_input->i_object_id, "demux_read", + stats_GetInteger( p_input, p_input->p->counters.p_read_packets, + &p_stats->i_read_packets ); + stats_GetInteger( p_input, p_input->p->counters.p_read_bytes, + &p_stats->i_read_bytes ); + stats_GetFloat( p_input, p_input->p->counters.p_input_bitrate, + &p_stats->f_input_bitrate ); + stats_GetInteger( p_input, p_input->p->counters.p_demux_read, &p_stats->i_demux_read_bytes ); - stats_GetFloat( p_input, p_input->i_object_id, "demux_bitrate", - &p_stats->f_demux_bitrate ); + stats_GetFloat( p_input, p_input->p->counters.p_demux_bitrate, + &p_stats->f_demux_bitrate ); - stats_GetInteger( p_input, p_input->i_object_id, "decoded_video", + /* Decoders */ + stats_GetInteger( p_input, p_input->p->counters.p_decoded_video, &p_stats->i_decoded_video ); - stats_GetInteger( p_input, p_input->i_object_id, "decoded_audio", + stats_GetInteger( p_input, p_input->p->counters.p_decoded_audio, &p_stats->i_decoded_audio ); /* Sout */ - stats_GetInteger( p_input, p_input->i_object_id, "sout_sent_packets", - &p_stats->i_sent_packets ); - stats_GetInteger( p_input, p_input->i_object_id, "sout_sent_bytes", - &p_stats->i_sent_bytes ); - stats_GetFloat ( p_input, p_input->i_object_id, "sout_send_bitrate", - &p_stats->f_send_bitrate ); - - /* Aout - We store in p_input because aout is shared */ - stats_GetInteger( p_input, p_input->i_object_id, "played_abuffers", + if( p_input->p->counters.p_sout_send_bitrate ) + { + stats_GetInteger( p_input, p_input->p->counters.p_sout_sent_packets, + &p_stats->i_sent_packets ); + stats_GetInteger( p_input, p_input->p->counters.p_sout_sent_bytes, + &p_stats->i_sent_bytes ); + stats_GetFloat ( p_input, p_input->p->counters.p_sout_send_bitrate, + &p_stats->f_send_bitrate ); + } + + /* Aout */ + stats_GetInteger( p_input, p_input->p->counters.p_played_abuffers, &p_stats->i_played_abuffers ); - stats_GetInteger( p_input, p_input->i_object_id, "lost_abuffers", + stats_GetInteger( p_input, p_input->p->counters.p_lost_abuffers, &p_stats->i_lost_abuffers ); - /* Vouts - FIXME: Store all in input */ - p_list = vlc_list_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD ); - if( p_list ) - { - p_stats->i_displayed_pictures = 0 ; - p_stats->i_lost_pictures = 0; - for( i_index = 0; i_index < p_list->i_count ; i_index ++ ) - { - int i_displayed = 0, i_lost = 0; - p_obj = (vlc_object_t *)p_list->p_values[i_index].p_object; - stats_GetInteger( p_obj, p_obj->i_object_id, "displayed_pictures", - &i_displayed ); - stats_GetInteger( p_obj, p_obj->i_object_id, "lost_pictures", - &i_lost ); - p_stats->i_displayed_pictures += i_displayed; - p_stats->i_lost_pictures += i_lost; - } - vlc_list_release( p_list ); - } + /* Vouts */ + stats_GetInteger( p_input, p_input->p->counters.p_displayed_pictures, + &p_stats->i_displayed_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 = @@ -344,6 +219,7 @@ void stats_ReinitInputStats( input_stats_t *p_stats ) 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 ) @@ -351,8 +227,9 @@ void stats_DumpInputStats( input_stats_t *p_stats ) vlc_mutex_lock( &p_stats->lock ); /* f_bitrate is in bytes / microsecond * *1000 => bytes / millisecond => kbytes / seconds */ - fprintf( stderr, "Input : %i (%i bytes) - %f kB/s - Demux : %i (%i bytes) - %f kB/s\n" - " - Vout : %i/%i - Aout : %i/%i - Vout : %f\n", + fprintf( stderr, "Input : %i (%i bytes) - %f kB/s - " + "Demux : %i (%i bytes) - %f kB/s\n" + " - Vout : %i/%i - Aout : %i/%i - Sout : %f\n", p_stats->i_read_packets, p_stats->i_read_bytes, p_stats->f_input_bitrate * 1000, p_stats->i_demux_read_packets, p_stats->i_demux_read_bytes, @@ -363,11 +240,13 @@ void stats_DumpInputStats( input_stats_t *p_stats ) vlc_mutex_unlock( &p_stats->lock ); } -void __stats_ComputeGlobalStats( vlc_object_t *p_obj, - global_stats_t *p_stats ) +void __stats_ComputeGlobalStats( vlc_object_t *p_obj, global_stats_t *p_stats ) { vlc_list_t *p_list; int i_index; + + if( !libvlc_stats (p_obj) ) return; + vlc_mutex_lock( &p_stats->lock ); p_list = vlc_list_find( p_obj, VLC_OBJECT_INPUT, FIND_ANYWHERE ); @@ -377,13 +256,16 @@ void __stats_ComputeGlobalStats( vlc_object_t *p_obj, for( i_index = 0; i_index < p_list->i_count ; i_index ++ ) { float f_in = 0, f_out = 0, f_demux = 0; - p_obj = (vlc_object_t *)p_list->p_values[i_index].p_object; - stats_GetFloat( p_obj, p_obj->i_object_id, "input_bitrate", - &f_in ); - stats_GetFloat( p_obj, p_obj->i_object_id, "sout_send_bitrate", - &f_out ); - stats_GetFloat( p_obj, p_obj->i_object_id, "demux_bitrate", - &f_demux ); + input_thread_t *p_input = (input_thread_t *) + p_list->p_values[i_index].p_object; + 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->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; @@ -395,24 +277,38 @@ void __stats_ComputeGlobalStats( vlc_object_t *p_obj, vlc_mutex_unlock( &p_stats->lock ); } -void stats_ReinitGlobalStats( global_stats_t *p_stats ) +void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name, + unsigned int i_id ) { - p_stats->f_input_bitrate = p_stats->f_output_bitrate = 0.0; -} + libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); + counter_t *p_counter = NULL; + if( !priv->b_stats ) return; -void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name ) -{ - counter_t *p_counter = stats_CounterGet( p_obj, - p_obj->p_vlc->i_object_id, - psz_name ); + vlc_mutex_lock( &priv->timer_lock ); + + for( int i = 0 ; i < priv->i_timers; i++ ) + { + if( priv->pp_timers[i]->i_id == i_id + && priv->pp_timers[i]->p_obj == p_obj ) + { + p_counter = priv->pp_timers[i]; + break; + } + } if( !p_counter ) { counter_sample_t *p_sample; - stats_Create( p_obj->p_vlc, psz_name, VLC_VAR_TIME, STATS_TIMER ); - p_counter = stats_CounterGet( p_obj, p_obj->p_vlc->i_object_id, - psz_name ); - if( !p_counter ) return; + p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME, + STATS_TIMER ); + if( !p_counter ) + goto out; + p_counter->psz_name = strdup( psz_name ); + p_counter->i_id = i_id; + 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 ) ); INSERT_ELEM( p_counter->pp_samples, p_counter->i_samples, @@ -424,55 +320,123 @@ void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name ) 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 ); - 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(); +out: + vlc_mutex_unlock( &priv->timer_lock ); } -void __stats_TimerStop( vlc_object_t *p_obj, const char *psz_name ) +void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id ) { - counter_t *p_counter = stats_CounterGet( p_obj, - p_obj->p_vlc->i_object_id, - psz_name ); + counter_t *p_counter = NULL; + 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( priv->pp_timers[i]->i_id == i_id + && priv->pp_timers[i]->p_obj == p_obj ) + { + p_counter = priv->pp_timers[i]; + break; + } + } if( !p_counter || p_counter->i_samples != 2 ) { - msg_Err( p_obj, "timer %s does not exist", psz_name ); - return; + msg_Err( p_obj, "timer does not exist" ); + 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; +out: + vlc_mutex_unlock( &priv->timer_lock ); } -void __stats_TimerDump( vlc_object_t *p_obj, const char *psz_name ) +void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id ) { - counter_t *p_counter = stats_CounterGet( p_obj, - p_obj->p_vlc->i_object_id, - psz_name ); - TimerDump( p_obj, p_counter, VLC_TRUE ); -} + counter_t *p_counter = NULL; + 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( priv->pp_timers[i]->i_id == i_id + && priv->pp_timers[i]->p_obj == p_obj ) + { + p_counter = priv->pp_timers[i]; + break; + } + } + TimerDump( p_obj, p_counter, true ); + vlc_mutex_unlock( &priv->timer_lock ); +} void __stats_TimersDumpAll( vlc_object_t *p_obj ) { - int i; - stats_handler_t *p_handler = stats_HandlerGet( p_obj ); - if( !p_handler ) return; + libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); - vlc_mutex_lock( &p_handler->object_lock ); - for ( i = 0 ; i< p_handler->i_counters; i++ ) + 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_TimerClean( vlc_object_t *p_obj, unsigned int i_id ) +{ + 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]; + 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( &priv->timer_lock ); +} + +void stats_CounterClean( counter_t *p_c ) +{ + if( p_c ) { - if( p_handler->pp_counters[i]->i_compute_type == STATS_TIMER ) + int i = p_c->i_samples - 1 ; + while( i >= 0 ) { - TimerDump( p_obj, p_handler->pp_counters[i], VLC_FALSE ); + 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--; } + free( p_c->psz_name ); + free( p_c ); } - vlc_mutex_unlock( &p_handler->object_lock ); } @@ -484,14 +448,13 @@ void __stats_TimersDumpAll( vlc_object_t *p_obj ) * Update a statistics counter, according to its type * If needed, perform a bit of computation (derivative, mostly) * This function must be entered with stats handler lock - * \param p_handler stats handler singleton * \param p_counter the counter to update * \param val the "new" value * \return an error code */ -static int stats_CounterUpdate( stats_handler_t *p_handler, - counter_t *p_counter, - vlc_value_t val ) +static int CounterUpdate( vlc_object_t *p_handler, + counter_t *p_counter, + vlc_value_t val, vlc_value_t *new_val ) { switch( p_counter->i_compute_type ) { @@ -507,7 +470,7 @@ static int stats_CounterUpdate( stats_handler_t *p_handler, p_counter->i_type != VLC_VAR_INTEGER && p_counter->i_compute_type != STATS_LAST ) { - msg_Err( p_handler, "Unable to compute MIN or MAX for this type"); + msg_Err( p_handler, "unable to compute MIN or MAX for this type"); return VLC_EGENERIC; } @@ -543,6 +506,7 @@ static int stats_CounterUpdate( stats_handler_t *p_handler, free( p_counter->pp_samples[0]->value.psz_string ); } p_counter->pp_samples[0]->value = val; + *new_val = p_counter->pp_samples[0]->value; } } break; @@ -595,9 +559,14 @@ static int stats_CounterUpdate( stats_handler_t *p_handler, switch( p_counter->i_type ) { case VLC_VAR_INTEGER: - case VLC_VAR_FLOAT: p_counter->pp_samples[0]->value.i_int += val.i_int; + if( new_val ) + new_val->i_int = p_counter->pp_samples[0]->value.i_int; break; + case VLC_VAR_FLOAT: + p_counter->pp_samples[0]->value.f_float += val.f_float; + if( new_val ) + new_val->f_float = p_counter->pp_samples[0]->value.f_float; default: msg_Err( p_handler, "Trying to increment invalid variable %s", p_counter->psz_name ); @@ -609,82 +578,22 @@ static int stats_CounterUpdate( stats_handler_t *p_handler, return VLC_SUCCESS; } -static counter_t *GetCounter( stats_handler_t *p_handler, int i_object_id, - const char *psz_name ) -{ - int i; - for( i = 0; i< p_handler->i_counters; i++ ) - { - counter_t *p_counter = p_handler->pp_counters[i]; - if( p_counter->i_source_object == i_object_id && - !strcmp( p_counter->psz_name, psz_name ) ) - { - return p_counter; - } - } - return NULL; -} - - -static stats_handler_t *stats_HandlerGet( vlc_object_t *p_this ) -{ - stats_handler_t *p_handler = (stats_handler_t*) - vlc_object_find( p_this->p_vlc, VLC_OBJECT_STATS, - FIND_ANYWHERE ); - if( !p_handler ) - { - p_handler = stats_HandlerCreate( p_this ); - if( !p_handler ) - { - return NULL; - } - vlc_object_yield( p_handler ); - } - return p_handler; -} - -/** - * Initialize statistics handler - * - * This function initializes the global statistics handler singleton, - * \param p_this the parent VLC object - */ -static stats_handler_t* stats_HandlerCreate( vlc_object_t *p_this ) -{ - stats_handler_t *p_handler; - - msg_Dbg( p_this, "creating statistics handler" ); - - p_handler = (stats_handler_t*) vlc_object_create( p_this, - VLC_OBJECT_STATS ); - - if( !p_handler ) - { - msg_Err( p_this, "out of memory" ); - return NULL; - } - p_handler->i_counters = 0; - p_handler->pp_counters = NULL; - - /// \bug is it p_vlc or p_libvlc ? - vlc_object_attach( p_handler, p_this->p_vlc ); - - return p_handler; -} - 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;