stats.c 20.9 KB
Newer Older
1
2
3
/*****************************************************************************
 * stats.c: Statistics handling
 *****************************************************************************
4
5
 * Copyright (C) 2006 the VideoLAN team
 * $Id$
6
 *
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
9
10
11
12
13
14
15
16
17
18
19
20
 *
 * 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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
dionoea's avatar
dionoea committed
21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
22
23
24
25
26
27
28
29
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
#include <stdio.h>                                               /* required */

#include <vlc/vlc.h>
zorglub's avatar
zorglub committed
30
#include <vlc/input.h>
31
32
33
34

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
35
36
37
static int CounterUpdate( vlc_object_t *p_this,
                          counter_t *p_counter,
                          vlc_value_t val, vlc_value_t * );
zorglub's avatar
zorglub committed
38
39
static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, vlc_bool_t);

40
41
42
43
/*****************************************************************************
 * Exported functions
 *****************************************************************************/

44
45
/**
 * Create a statistics counter
46
 * \param p_this a VLC object
47
48
49
50
51
52
53
 * \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
 * keep the last value), STATS_COUNTER (increment by the passed value),
 * STATS_MAX (keep the maximum passed value), STATS_MIN, or STATS_DERIVATIVE
 * (keep a time derivative of the value)
 */
54
55
counter_t * __stats_CounterCreate( vlc_object_t *p_this,
                                   int i_type, int i_compute_type )
56
{
zorglub's avatar
zorglub committed
57
    counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
58
59
60
61
62

    p_counter->i_compute_type = i_compute_type;
    p_counter->i_type = i_type;
    p_counter->i_samples = 0;
    p_counter->pp_samples = NULL;
63
    p_counter->psz_name = NULL;
64

65
66
67
    p_counter->update_interval = 0;
    p_counter->last_update = 0;

68
    return p_counter;
69
70
}

71
/** Update a counter element with new values
72
73
 * \param p_this a VLC object
 * \param p_counter the counter to update
74
75
 * \param val the vlc_value union containing the new value to aggregate. For
 * more information on how data is aggregated, \see __stats_Create
76
 * \param val_new a pointer that will be filled with new data
77
 */
78
int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
zorglub's avatar
zorglub committed
79
                    vlc_value_t val, vlc_value_t *val_new )
80
{
81
    if( !p_this->p_libvlc->b_stats || !p_counter ) return VLC_EGENERIC;
82
    return CounterUpdate( p_this, p_counter, val, val_new );
zorglub's avatar
zorglub committed
83
84
}

85
86
/** Get the aggregated value for a counter
 * \param p_this an object
87
 * \param p_counter the counter
88
89
90
91
 * \param val a pointer to an initialized vlc_value union. It will contain the
 * retrieved value
 * \return an error code
 */
92
int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
zorglub's avatar
zorglub committed
93
{
94
    if( !p_this->p_libvlc->b_stats || !p_counter || p_counter->i_samples == 0 )
zorglub's avatar
zorglub committed
95
    {
zorglub's avatar
zorglub committed
96
        val->i_int = val->f_float = 0.0;
zorglub's avatar
zorglub committed
97
98
99
        return VLC_EGENERIC;
    }

100
101
102
103
104
105
106
107
108
    switch( p_counter->i_compute_type )
    {
    case STATS_LAST:
    case STATS_MIN:
    case STATS_MAX:
    case STATS_COUNTER:
        *val = p_counter->pp_samples[0]->value;
        break;
    case STATS_DERIVATIVE:
zorglub's avatar
zorglub committed
109
110
111
112
113
114
115
        /* Not ready yet */
        if( p_counter->i_samples < 2 )
        {
            val->i_int = 0; val->f_float = 0.0;
            return VLC_EGENERIC;
        }
        if( p_counter->i_type == VLC_VAR_INTEGER )
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
        {
            float f = ( p_counter->pp_samples[0]->value.i_int -
                        p_counter->pp_samples[1]->value.i_int ) /
                    (float)(  p_counter->pp_samples[0]->date -
                              p_counter->pp_samples[1]->date );
            val->i_int = (int)f;
        }
        else
        {
            float f = (float)( p_counter->pp_samples[0]->value.f_float -
                               p_counter->pp_samples[1]->value.f_float ) /
                      (float)( p_counter->pp_samples[0]->date -
                               p_counter->pp_samples[1]->date );
            val->f_float = f;
        }
        break;
    }
zorglub's avatar
zorglub committed
133
    return VLC_SUCCESS;;
134
135
}

136
void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *p_stats )
zorglub's avatar
zorglub committed
137
{
138
    if( !p_input->p_libvlc->b_stats ) return;
139

140
    vlc_mutex_lock( &p_input->counters.counters_lock );
zorglub's avatar
zorglub committed
141
    vlc_mutex_lock( &p_stats->lock );
zorglub's avatar
zorglub committed
142
143

    /* Input */
144
145
    stats_GetInteger( p_input, p_input->counters.p_read_packets,
                      &p_stats->i_read_packets );
zorglub's avatar
zorglub committed
146
    stats_GetInteger( p_input, p_input->counters.p_read_bytes,
147
148
149
150
                      &p_stats->i_read_bytes );
    stats_GetFloat( p_input, p_input->counters.p_input_bitrate,
                    &p_stats->f_input_bitrate );
    stats_GetInteger( p_input, p_input->counters.p_demux_read,
zorglub's avatar
zorglub committed
151
                      &p_stats->i_demux_read_bytes );
152
153
    stats_GetFloat( p_input, p_input->counters.p_demux_bitrate,
                    &p_stats->f_demux_bitrate );
zorglub's avatar
zorglub committed
154

155
156
    /* Decoders */
    stats_GetInteger( p_input, p_input->counters.p_decoded_video,
zorglub's avatar
zorglub committed
157
                      &p_stats->i_decoded_video );
158
    stats_GetInteger( p_input, p_input->counters.p_decoded_audio,
zorglub's avatar
zorglub committed
159
160
                      &p_stats->i_decoded_audio );

zorglub's avatar
zorglub committed
161
    /* Sout */
162
163
164
165
166
167
168
169
170
171
172
173
    if( p_input->counters.p_sout_send_bitrate )
    {
        stats_GetInteger( p_input, p_input->counters.p_sout_sent_packets,
                          &p_stats->i_sent_packets );
        stats_GetInteger( p_input, p_input->counters.p_sout_sent_bytes,
                          &p_stats->i_sent_bytes );
        stats_GetFloat  ( p_input, p_input->counters.p_sout_send_bitrate,
                          &p_stats->f_send_bitrate );
    }

    /* Aout */
    stats_GetInteger( p_input, p_input->counters.p_played_abuffers,
zorglub's avatar
zorglub committed
174
                      &p_stats->i_played_abuffers );
175
    stats_GetInteger( p_input, p_input->counters.p_lost_abuffers,
zorglub's avatar
zorglub committed
176
177
                      &p_stats->i_lost_abuffers );

178
179
180
181
182
    /* Vouts */
    stats_GetInteger( p_input, p_input->counters.p_displayed_pictures,
                      &p_stats->i_displayed_pictures );
    stats_GetInteger( p_input, p_input->counters.p_lost_pictures,
                      &p_stats->i_lost_pictures );
zorglub's avatar
zorglub committed
183

zorglub's avatar
zorglub committed
184
    vlc_mutex_unlock( &p_stats->lock );
185
    vlc_mutex_unlock( &p_input->counters.counters_lock );
zorglub's avatar
zorglub committed
186
187
188
189
}

void stats_ReinitInputStats( input_stats_t *p_stats )
{
190
    vlc_mutex_lock( &p_stats->lock );
zorglub's avatar
zorglub committed
191
    p_stats->i_read_packets = p_stats->i_read_bytes =
192
193
194
195
    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->f_demux_bitrate = p_stats->f_average_demux_bitrate =
    p_stats->i_displayed_pictures = p_stats->i_lost_pictures =
zorglub's avatar
zorglub committed
196
    p_stats->i_played_abuffers = p_stats->i_lost_abuffers =
zorglub's avatar
zorglub committed
197
198
199
    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;
200
    vlc_mutex_unlock( &p_stats->lock );
zorglub's avatar
zorglub committed
201
202
203
204
205
}

void stats_DumpInputStats( input_stats_t *p_stats  )
{
    vlc_mutex_lock( &p_stats->lock );
206
207
    /* f_bitrate is in bytes / microsecond
     * *1000 => bytes / millisecond => kbytes / seconds */
208
209
210
    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",
211
                    p_stats->i_read_packets, p_stats->i_read_bytes,
zorglub's avatar
zorglub committed
212
                    p_stats->f_input_bitrate * 1000,
213
214
                    p_stats->i_demux_read_packets, p_stats->i_demux_read_bytes,
                    p_stats->f_demux_bitrate * 1000,
zorglub's avatar
zorglub committed
215
                    p_stats->i_displayed_pictures, p_stats->i_lost_pictures,
zorglub's avatar
zorglub committed
216
217
                    p_stats->i_played_abuffers, p_stats->i_lost_abuffers,
                    p_stats->f_send_bitrate );
zorglub's avatar
zorglub committed
218
219
220
    vlc_mutex_unlock( &p_stats->lock );
}

221
void __stats_ComputeGlobalStats( vlc_object_t *p_obj, global_stats_t *p_stats )
zorglub's avatar
zorglub committed
222
223
224
{
    vlc_list_t *p_list;
    int i_index;
225

226
    if( !p_obj->p_libvlc->b_stats ) return;
227

zorglub's avatar
zorglub committed
228
229
    vlc_mutex_lock( &p_stats->lock );

230
    p_list = vlc_list_find( p_obj, VLC_OBJECT_INPUT, FIND_ANYWHERE );
zorglub's avatar
zorglub committed
231
232
    if( p_list )
    {
233
        float f_total_in = 0, f_total_out = 0,f_total_demux = 0;
zorglub's avatar
zorglub committed
234
235
        for( i_index = 0; i_index < p_list->i_count ; i_index ++ )
        {
236
            float f_in = 0, f_out = 0, f_demux = 0;
237
238
            input_thread_t *p_input = (input_thread_t *)
                             p_list->p_values[i_index].p_object;
239
            vlc_mutex_lock( &p_input->counters.counters_lock );
240
241
242
243
244
245
            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,
                                    &f_out );
            stats_GetFloat( p_obj, p_input->counters.p_demux_bitrate,
                                &f_demux );
246
            vlc_mutex_unlock( &p_input->counters.counters_lock );
247
            f_total_in += f_in; f_total_out += f_out;f_total_demux += f_demux;
zorglub's avatar
zorglub committed
248
        }
249
250
251
        p_stats->f_input_bitrate = f_total_in;
        p_stats->f_output_bitrate = f_total_out;
        p_stats->f_demux_bitrate = f_total_demux;
zorglub's avatar
zorglub committed
252
253
254
255
256
257
258
259
        vlc_list_release( p_list );
    }

    vlc_mutex_unlock( &p_stats->lock );
}

void stats_ReinitGlobalStats( global_stats_t *p_stats )
{
260
    vlc_mutex_lock( &p_stats->lock );
zorglub's avatar
zorglub committed
261
    p_stats->f_input_bitrate = p_stats->f_output_bitrate = 0.0;
262
    vlc_mutex_unlock( &p_stats->lock );
zorglub's avatar
zorglub committed
263
264
265
}


266
267
void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
                         unsigned int i_id )
zorglub's avatar
zorglub committed
268
{
269
270
    int i;
    counter_t *p_counter = NULL;
271
272
    if( !p_obj->p_libvlc->b_stats ) return;
    vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
273

274
    for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
275
    {
276
        if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
277
        {
278
            p_counter = p_obj->p_libvlc->pp_timers[i];
279
280
281
            break;
        }
    }
zorglub's avatar
zorglub committed
282
283
284
    if( !p_counter )
    {
        counter_sample_t *p_sample;
285
        p_counter = stats_CounterCreate( p_obj->p_libvlc_global, VLC_VAR_TIME,
286
                                         STATS_TIMER );
287
288
        if( !p_counter )
        {
289
            vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
290
291
            return;
        }
292
293
        p_counter->psz_name = strdup( psz_name );
        p_counter->i_id = i_id;
294
295
        INSERT_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers,
                     p_obj->p_libvlc->i_timers, p_counter );
296

zorglub's avatar
zorglub committed
297
298
299
300
301
302
303
304
305
306
307
308
309
310
        /* 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,
                     p_counter->i_samples, p_sample );
        p_sample->date = 0; p_sample->value.b_bool = 0;
        /* 2nd sample : global_time, i_samples */
        p_sample = (counter_sample_t *)malloc( sizeof( counter_sample_t ) );
        INSERT_ELEM( p_counter->pp_samples, p_counter->i_samples,
                     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 )
    {
        msg_Warn( p_obj, "timer %s was already started !", psz_name );
311
        vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
zorglub's avatar
zorglub committed
312
313
314
315
        return;
    }
    p_counter->pp_samples[0]->value.b_bool = VLC_TRUE;
    p_counter->pp_samples[0]->date = mdate();
316
    vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
zorglub's avatar
zorglub committed
317
318
}

319
void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
zorglub's avatar
zorglub committed
320
{
321
322
    counter_t *p_counter = NULL;
    int i;
323
324
325
    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++ )
326
    {
327
        if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
328
        {
329
            p_counter = p_obj->p_libvlc->pp_timers[i];
330
331
332
            break;
        }
    }
zorglub's avatar
zorglub committed
333
334
    if( !p_counter || p_counter->i_samples != 2 )
    {
335
        msg_Err( p_obj, "timer does not exist" );
336
        vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
zorglub's avatar
zorglub committed
337
338
339
340
341
342
        return;
    }
    p_counter->pp_samples[0]->value.b_bool = VLC_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;
343
    vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
zorglub's avatar
zorglub committed
344
345
}

346
void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
zorglub's avatar
zorglub committed
347
{
348
349
    counter_t *p_counter = NULL;
    int i;
350
351
352
    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++ )
353
    {
354
        if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
355
        {
356
            p_counter = p_obj->p_libvlc->pp_timers[i];
357
358
359
            break;
        }
    }
zorglub's avatar
zorglub committed
360
    TimerDump( p_obj, p_counter, VLC_TRUE );
361
    vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
zorglub's avatar
zorglub committed
362
363
364
365
}

void __stats_TimersDumpAll( vlc_object_t *p_obj )
{
zorglub's avatar
zorglub committed
366
    int i;
367
368
369
370
371
    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 );
372
}
zorglub's avatar
zorglub committed
373

374
375
376
void __stats_TimersClean( vlc_object_t *p_obj )
{
    int i;
377
378
    vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
    for ( i = p_obj->p_libvlc->i_timers -1 ; i >= 0; i-- )
zorglub's avatar
zorglub committed
379
    {
380
381
        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 );
382
        stats_CounterClean( p_counter );
zorglub's avatar
zorglub committed
383
    }
384
    vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
385
386
387
388
389
}

void stats_CounterClean( counter_t *p_c )
{
    int i;
390
    if( p_c )
391
    {
392
        i = p_c->i_samples - 1 ;
393
        while( i >= 0 )
394
395
396
397
        {
            counter_sample_t *p_s = p_c->pp_samples[i];
            REMOVE_ELEM( p_c->pp_samples, p_c->i_samples, i );
            free( p_s );
398
            i--;
399
        }
400
401
        if( p_c->psz_name ) free( p_c->psz_name );
        free( p_c );
402
    }
zorglub's avatar
zorglub committed
403
404
}

zorglub's avatar
zorglub committed
405
406
407
408
409
410
411
412
413
414
415
416
417

/********************************************************************
 * Following functions are local
 ********************************************************************/

/**
 * 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_counter the counter to update
 * \param val the "new" value
 * \return an error code
 */
418
419
420
static int CounterUpdate( vlc_object_t *p_handler,
                          counter_t *p_counter,
                          vlc_value_t val, vlc_value_t *new_val )
421
422
423
{
    switch( p_counter->i_compute_type )
    {
zorglub's avatar
zorglub committed
424
425
    case STATS_LAST:
    case STATS_MIN:
zorglub's avatar
zorglub committed
426
    case STATS_MAX:
427
428
429
430
431
        if( p_counter->i_samples > 1)
        {
            msg_Err( p_handler, "LAST counter has several samples !" );
            return VLC_EGENERIC;
        }
zorglub's avatar
zorglub committed
432
433
434
435
        if( p_counter->i_type != VLC_VAR_FLOAT &&
            p_counter->i_type != VLC_VAR_INTEGER &&
            p_counter->i_compute_type != STATS_LAST )
        {
zorglub's avatar
zorglub committed
436
            msg_Err( p_handler, "unable to compute MIN or MAX for this type");
zorglub's avatar
zorglub committed
437
438
439
            return VLC_EGENERIC;
        }

440
441
442
443
444
445
446
447
448
449
450
        if( p_counter->i_samples == 0 )
        {
            counter_sample_t *p_new = (counter_sample_t*)malloc(
                                               sizeof( counter_sample_t ) );
            p_new->value.psz_string = NULL;

            INSERT_ELEM( p_counter->pp_samples, p_counter->i_samples,
                         p_counter->i_samples, p_new );
        }
        if( p_counter->i_samples == 1 )
        {
zorglub's avatar
zorglub committed
451
452
453
454
455
456
457
458
459
460
461
462
463
464
            /* Update if : LAST or (MAX and bigger) or (MIN and bigger) */
            if( p_counter->i_compute_type == STATS_LAST ||
                ( p_counter->i_compute_type == STATS_MAX &&
                   ( ( p_counter->i_type == VLC_VAR_INTEGER &&
                       p_counter->pp_samples[0]->value.i_int > val.i_int ) ||
                     ( p_counter->i_type == VLC_VAR_FLOAT &&
                       p_counter->pp_samples[0]->value.f_float > val.f_float )
                   ) ) ||
                ( p_counter->i_compute_type == STATS_MIN &&
                   ( ( p_counter->i_type == VLC_VAR_INTEGER &&
                       p_counter->pp_samples[0]->value.i_int < val.i_int ) ||
                     ( p_counter->i_type == VLC_VAR_FLOAT &&
                       p_counter->pp_samples[0]->value.f_float < val.f_float )
                   ) ) )
465
            {
zorglub's avatar
zorglub committed
466
467
468
469
470
471
                if( p_counter->i_type == VLC_VAR_STRING &&
                    p_counter->pp_samples[0]->value.psz_string )
                {
                    free( p_counter->pp_samples[0]->value.psz_string );
                }
                p_counter->pp_samples[0]->value = val;
zorglub's avatar
zorglub committed
472
                *new_val = p_counter->pp_samples[0]->value;
473
474
475
            }
        }
        break;
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
    case STATS_DERIVATIVE:
    {
        counter_sample_t *p_new, *p_old;
        if( mdate() - p_counter->last_update < p_counter->update_interval )
        {
            return VLC_EGENERIC;
        }
        p_counter->last_update = mdate();
        if( p_counter->i_type != VLC_VAR_FLOAT &&
            p_counter->i_type != VLC_VAR_INTEGER )
        {
            msg_Err( p_handler, "Unable to compute DERIVATIVE for this type");
            return VLC_EGENERIC;
        }
        /* Insert the new one at the beginning */
        p_new = (counter_sample_t*)malloc( sizeof( counter_sample_t ) );
        p_new->value = val;
        p_new->date = p_counter->last_update;
        INSERT_ELEM( p_counter->pp_samples, p_counter->i_samples,
                     0, p_new );

        if( p_counter->i_samples == 3 )
        {
            p_old = p_counter->pp_samples[2];
            REMOVE_ELEM( p_counter->pp_samples, p_counter->i_samples, 2 );
            free( p_old );
        }
        break;
    }
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
    case STATS_COUNTER:
        if( p_counter->i_samples > 1)
        {
            msg_Err( p_handler, "LAST counter has several samples !" );
            return VLC_EGENERIC;
        }
        if( p_counter->i_samples == 0 )
        {
            counter_sample_t *p_new = (counter_sample_t*)malloc(
                                               sizeof( counter_sample_t ) );
            p_new->value.psz_string = NULL;

            INSERT_ELEM( p_counter->pp_samples, p_counter->i_samples,
                         p_counter->i_samples, p_new );
        }
        if( p_counter->i_samples == 1 )
        {
            switch( p_counter->i_type )
            {
            case VLC_VAR_INTEGER:
                p_counter->pp_samples[0]->value.i_int += val.i_int;
zorglub's avatar
zorglub committed
526
527
                if( new_val )
                    new_val->i_int = p_counter->pp_samples[0]->value.i_int;
528
                break;
zorglub's avatar
zorglub committed
529
530
531
532
            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;
533
534
535
536
537
538
539
540
541
542
543
            default:
                msg_Err( p_handler, "Trying to increment invalid variable %s",
                         p_counter->psz_name );
                return VLC_EGENERIC;
            }
        }
        break;
    }
    return VLC_SUCCESS;
}

zorglub's avatar
zorglub committed
544
545
546
547
548
549
550
static void TimerDump( vlc_object_t *p_obj, counter_t *p_counter,
                       vlc_bool_t b_total )
{
    mtime_t last, total;
    int i_total;
    if( !p_counter || p_counter->i_samples != 2 )
    {
551
        msg_Err( p_obj, "timer %s does not exist", p_counter->psz_name );
zorglub's avatar
zorglub committed
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
        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 )
    {
        last = mdate() - p_counter->pp_samples[0]->date;
        i_total += 1;
        total += last;
    }
    else
    {
        last = p_counter->pp_samples[0]->date;
    }
    if( b_total )
    {
        msg_Dbg( p_obj,
             "TIMER %s : %.3f ms - Total %.3f ms / %i intvls (Avg %.3f ms)",
             p_counter->psz_name, (float)last/1000, (float)total/1000, i_total,
             (float)(total)/(1000*(float)i_total ) );
    }
    else
    {
        msg_Dbg( p_obj,
             "TIMER %s : Total %.3f ms / %i intvls (Avg %.3f ms)",
             p_counter->psz_name, (float)total/1000, i_total,
             (float)(total)/(1000*(float)i_total ) );
    }
}