Changeset baacaea316cff470f3fe11e52a833ef4a51afe74

Timestamp:

15/06/06 23:22:35 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1150406555 +0000

git-parent:

[7a6b8a51f8b06684d32ba3a4985230363c32d8b0]

git-author:

Clément Stenac <zorglub@videolan.org> 1150406555 +0000

Message:

Partial rewrite of stats to avoid lookups (Closes:#693)

Files:

• include/main.h (modified) (1 diff)
• include/vlc_httpd.h (modified) (1 diff)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_messages.h (modified) (6 diffs)
• include/vlc_symbols.h (modified) (9 diffs)
• src/audio_output/dec.c (modified) (2 diffs)
• src/audio_output/input.c (modified) (3 diffs)
• src/input/decoder.c (modified) (6 diffs)
• src/input/es_out.c (modified) (1 diff)
• src/input/input.c (modified) (5 diffs)
• src/input/stream.c (modified) (6 diffs)
• src/libvlc.c (modified) (3 diffs)
• src/misc/objects.c (modified) (1 diff)
• src/misc/stats.c (modified) (14 diffs)
• src/network/httpd.c (modified) (3 diffs)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/thread.c (modified) (1 diff)
• src/stream_output/stream_output.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (6 diffs)

include/main.h

@@ -57 +57 @@
-    /* Do stats ? - We keep this boolean to avoid unneeded lookups */
-    vlc_bool_t             b_stats;
-
+
+
+
-
-    /* Arch-specific variables */

include/vlc_httpd.h

@@ -77 +77 @@
-    int         i_port;
-    int         *fd;
+
+    /* Statistics */
+    counter_t *p_active_counter;
+    counter_t *p_total_counter;
-
-    vlc_mutex_t lock;

include/vlc_input.h

@@ -422 +422 @@
-    input_source_t **slave;
-
+    /* Stats counters */
+    struct {
+        counter_t *p_read_packets;
+        counter_t *p_read_bytes;
+        counter_t *p_input_bitrate;
+        counter_t *p_demux_read;
+        counter_t *p_demux_bitrate;
+        counter_t *p_decoded_audio;
+        counter_t *p_decoded_video;
+        counter_t *p_decoded_sub;
+        counter_t *p_sout_sent_packets;
+        counter_t *p_sout_sent_bytes;
+        counter_t *p_sout_send_bitrate;
+        counter_t *p_played_abuffers;
+        counter_t *p_lost_abuffers;
+        counter_t *p_displayed_pictures;
+        counter_t *p_lost_pictures;
+        vlc_mutex_t counters_lock;
+    } counters;
+
-    /* Buffer of pending actions */
-    vlc_mutex_t lock_control;

include/vlc_messages.h

@@ -229 +229 @@
-struct counter_t
-{
-
-
+
-    char              * psz_name;
-    int                 i_type;
@@ -268 +267 @@
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    int i_ret;
-    vlc_value_t val; val.i_int = 0;
-i_id, i
+p
-    *value = val.i_int;
-    return i_ret;
-}
-
-,d) __stats_GetFloat( VLC_OBJECT(a), b, c, d
-int i_id
-unsigned int i_counter, 
-
-   
+) __stats_GetFloat( VLC_OBJECT(a), b, c
+counter_t *p_counter
+
+
+    
-    vlc_value_t val; val.f_float = 0.0;
-i_id, i
+p
-    *value = val.f_float;
-    return i_ret;
-}
-#define stats_UpdateInteger(a,b,c,d) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
-
-
-
+
+
-{
-    int i_ret;
@@ -317 +305 @@
-    vlc_value_t new_val; new_val.i_int = 0;
-    val.i_int = i;
-i_counter, val 
+p_co, val
-    if( pi_new )
-        *pi_new = new_val.i_int;
@@ -323 +311 @@
-}
-#define stats_UpdateFloat(a,b,c,d) __stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
-
-
-
+
+
-{
-    vlc_value_t val;
@@ -331 +318 @@
-    vlc_value_t new_val;new_val.f_float = 0.0;
-    val.f_float = f;
-i_counter
+p_co
-    if( pf_new )
-        *pf_new = new_val.f_float;
@@ -414 +401 @@
-VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, unsigned int) );
-VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) );
+#define stats_TimersClean(a) __stats_TimersClean( VLC_OBJECT(a) )
+VLC_EXPORT( void, __stats_TimersClean, (vlc_object_t * ) );

include/vlc_symbols.h

@@ -439 +439 @@
-    void (*__intf_UserProgressUpdate_inner) (vlc_object_t*, int, const char*, float);
-    void (*__intf_UserHide_inner) (vlc_object_t *, int);
-int (*__stats_Create_inner) (vlc_object_t*, const char *, unsigned int, int, int)
-unsigned int
-int, unsigned int
+void *__stats_Create_deprecated
+counter_t *
+counter_t *
-    void (*stats_ComputeInputStats_inner) (input_thread_t*, input_stats_t*);
-    void (*stats_DumpInputStats_inner) (input_stats_t *);
-    void (*stats_ReinitInputStats_inner) (input_stats_t *);
-    counter_t* (*__stats_CounterGet_inner) (vlc_object_t*, int, unsigned int);
-    void *__stats_CounterGet_deprecated;
-    input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
-(*stats_HandlerDestroy_inner) (stats_handler_t*)
+*stats_HandlerDestroy_deprecated
-    vlc_t * (*vlc_current_object_inner) (int);
-    void (*__var_OptionParse_inner) (vlc_object_t *, const char *);
@@ -515 +514 @@
-    void (*playlist_NodesCreateForSD_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **);
-    vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
+    counter_t * (*__stats_CounterCreate_inner) (vlc_object_t*, int, int);
+    void *stats_TimerClean_deprecated;
+    void *stats_TimersClean_deprecated;
+    void (*__stats_TimersClean_inner) (vlc_object_t *);
-};
-# if defined (__PLUGIN__)
@@ -910 +913 @@
-#  define __intf_UserProgressUpdate (p_symbols)->__intf_UserProgressUpdate_inner
-#  define __intf_UserHide (p_symbols)->__intf_UserHide_inner
-#  define __stats_Create (p_symbols)->__stats_Create_inner
-#  define __stats_Update (p_symbols)->__stats_Update_inner
-#  define __stats_Get (p_symbols)->__stats_Get_inner
@@ -916 +918 @@
-#  define stats_DumpInputStats (p_symbols)->stats_DumpInputStats_inner
-#  define stats_ReinitInputStats (p_symbols)->stats_ReinitInputStats_inner
-#  define __stats_CounterGet (p_symbols)->__stats_CounterGet_inner
-#  define __input_CreateThread2 (p_symbols)->__input_CreateThread2_inner
-#  define stats_HandlerDestroy (p_symbols)->stats_HandlerDestroy_inner
-#  define vlc_current_object (p_symbols)->vlc_current_object_inner
-#  define __var_OptionParse (p_symbols)->__var_OptionParse_inner
@@ -983 +983 @@
-#  define playlist_NodesCreateForSD (p_symbols)->playlist_NodesCreateForSD_inner
-#  define input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
+#  define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
+#  define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1381 +1383 @@
-    ((p_symbols)->__intf_UserProgressUpdate_inner) = __intf_UserProgressUpdate; \
-    ((p_symbols)->__intf_UserHide_inner) = __intf_UserHide; \
-    ((p_symbols)->__stats_Create_inner) = __stats_Create; \
-    ((p_symbols)->__stats_Update_inner) = __stats_Update; \
-    ((p_symbols)->__stats_Get_inner) = __stats_Get; \
@@ -1387 +1388 @@
-    ((p_symbols)->stats_DumpInputStats_inner) = stats_DumpInputStats; \
-    ((p_symbols)->stats_ReinitInputStats_inner) = stats_ReinitInputStats; \
-    ((p_symbols)->__stats_CounterGet_inner) = __stats_CounterGet; \
-    ((p_symbols)->__input_CreateThread2_inner) = __input_CreateThread2; \
-    ((p_symbols)->stats_HandlerDestroy_inner) = stats_HandlerDestroy; \
-    ((p_symbols)->vlc_current_object_inner) = vlc_current_object; \
-    ((p_symbols)->__var_OptionParse_inner) = __var_OptionParse; \
@@ -1454 +1453 @@
-    ((p_symbols)->playlist_NodesCreateForSD_inner) = playlist_NodesCreateForSD; \
-    ((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
+    ((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
+    ((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
@@ -1480 +1481 @@
-    (p_symbols)->playlist_Move_deprecated = NULL; \
-    (p_symbols)->playlist_NodeRemoveParent_deprecated = NULL; \
+    (p_symbols)->__stats_Create_deprecated = NULL; \
-    (p_symbols)->__stats_CounterGet_deprecated = NULL; \
+    (p_symbols)->stats_HandlerDestroy_deprecated = NULL; \
-    (p_symbols)->__stats_TimerDumpAll_deprecated = NULL; \
-    (p_symbols)->playlist_ItemNewFromInput_deprecated = NULL; \
+    (p_symbols)->stats_TimerClean_deprecated = NULL; \
+    (p_symbols)->stats_TimersClean_deprecated = NULL; \
-
-# endif /* __PLUGIN__ */

src/audio_output/dec.c

@@ -313 +313 @@
-        if( p_input->p_input_thread )
-        {
-
-
+
+
+
+
+
-        }
-        aout_BufferFree( p_buffer );
@@ -368 +371 @@
-    if( p_input->p_input_thread )
-    {
-
-
+
+
+
+
+
-    }
-    vlc_mutex_unlock( &p_aout->mixer_lock );

src/audio_output/input.c

@@ -450 +450 @@
-        if( p_input->p_input_thread )
-        {
-
-
+
+
+
-        }
-    }
@@ -463 +464 @@
-        if( p_input->p_input_thread )
-        {
-
-
+
+
+
-        }
-        aout_BufferFree( p_buffer );
@@ -505 +507 @@
-        if( p_input->p_input_thread )
-        {
-
-
+
+
+
-        }
-        return 0;

src/input/decoder.c

@@ -430 +430 @@
-    vlc_object_attach( p_dec, p_input );
-
-    stats_Create( p_dec->p_parent, "decoded_audio", STATS_DECODED_AUDIO,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-    stats_Create( p_dec->p_parent, "decoded_video", STATS_DECODED_VIDEO,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-    stats_Create( p_dec->p_parent, "decoded_sub", STATS_DECODED_SUB,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-    /* Find a suitable decoder/packetizer module */
-    if( i_object_type == VLC_OBJECT_DECODER )
@@ -628 +622 @@
-                                                       &p_packetized_block )) )
-                    {
-
-
-
+
+
+
+
+
+
+
+
-                         * but that's not easy with non raw audio stream */
-                        if( p_dec->p_owner->i_preroll_end > 0 &&
@@ -653 +652 @@
-        else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
-        {
-
+
+
+
+
+
+
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
@@ -699 +703 @@
-                                                       &p_packetized_block )) )
-                    {
-
-
+
+
+
+
+
+
-                        if( p_dec->p_owner->i_preroll_end > 0 &&
-                            p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -721 +729 @@
-        else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
-        {
-
+
+
+
+
+
+
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -741 +754 @@
-        while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
-        {
-
+
+
+
+
+
+
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_spu->i_start < p_dec->p_owner->i_preroll_end &&

src/input/es_out.c

@@ -1026 +1026 @@
-    if( p_input->p_libvlc->b_stats )
-    {
-
-
-
+
+
+
+
+
+
-    }
-

src/input/input.c

@@ -680 +680 @@
-    {
-        /* Prepare statistics */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* handle sout */
@@ -716 +714 @@
-                return VLC_EGENERIC;
-            }
+            INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
+            INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
+            INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
+            p_input->counters.p_sout_send_bitrate->update_interval = 1000000;
-        }
-        free( psz );
@@ -1106 +1108 @@
-        input_EsOutDelete( p_input->p_es_out );
-
+#define CL_CO( c ) stats_CounterClean( p_input->counters.p_##c )
+
+        CL_CO( read_bytes );
+        CL_CO( read_packets );
+        CL_CO( demux_read );
+        CL_CO( input_bitrate );
+        CL_CO( demux_bitrate );
+        CL_CO( played_abuffers );
+        CL_CO( lost_abuffers );
+        CL_CO( displayed_pictures );
+        CL_CO( lost_pictures );
+        CL_CO( decoded_audio) ;
+        CL_CO( decoded_video );
+        CL_CO( decoded_sub) ;
+        CL_CO( read_bytes );
+
-    /* Close optional stream output instance */
-    if( p_input->p_sout )
@@ -1112 +1130 @@
-            vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-        vlc_value_t keep;
+
+        CL_CO( sout_sent_packets );
+        CL_CO( sout_sent_bytes );
+        CL_CO( sout_send_bitrate );
-
-        if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
@@ -1129 +1151 @@
-    }
-
+#undef CL_CO
-    /* Tell we're dead */
-    p_input->b_dead = VLC_TRUE;

src/input/stream.c

@@ -25 +25 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <assert.h>
-
-#include "input_internal.h"
@@ -1578 +1579 @@
-    int i_total;
-
+    input_thread_t *p_input = (input_thread_t *)s->p_parent->p_parent ;
+    assert( p_input );
+
-    if( !p_sys->i_list )
-    {
-        i_read = p_access->pf_read( p_access, p_read, i_read );
-
+
+
-                             &i_total );
-->p_parent->p_parent , STATS_INPUT_BITRATE
+, p_input->counters.p_input_bitrate
-                           (float)i_total, NULL );
-->p_parent->p_parent , STATS_READ_PACKETS, 1,
-                     NULL
+, p_input->counters.p_read_packets, 1, NULL );
+vlc_mutex_unlock( &p_input->counters.counters_lock
-        return i_read;
-    }
@@ -1615 +1620 @@
-
-    /* Update read bytes in input */
-
-
-
-
-
+
+
+
+
+
+
-    return i_read;
-}
@@ -1631 +1637 @@
-    int i_total;
-
+    input_thread_t *p_input = (input_thread_t *)s->p_parent->p_parent ;
+    assert( p_input );
+
-    if( !p_sys->i_list )
-    {
@@ -1637 +1646 @@
-        if( p_block && p_access->p_libvlc->b_stats )
-        {
-
+
+
-                                 p_block->i_buffer, &i_total );
-->p_parent->p_parent ,  STATS_INPUT_BITRATE
+, p_input->counters.p_input_bitrate
-                              (float)i_total, NULL );
-
+
+
-        }
-        return p_block;
@@ -1672 +1683 @@
-    if( p_block )
-    {
-
+
+
-                             p_block->i_buffer, &i_total );
-->p_parent->p_parent ,  STATS_INPUT_BITRATE
+, p_input->counters.p_input_bitrate
-                          (float)i_total, NULL );
-->p_parent->p_parent ,  STATS_READ_PACKETS
+, p_input->counters.p_read_packets
-                             1 , NULL);
-}
-
+    vlc_mutex_unlock( &p_input->counters.counters_lock );
+
-    return p_block;
-}

src/libvlc.c

@@ -687 +687 @@
-
-    libvlc.b_stats = config_GetInt( p_vlc, "stats" );
-
+
+
+
-
-    /*
@@ -888 +890 @@
-    aout_instance_t    * p_aout;
-    announce_handler_t * p_announce;
-    stats_handler_t    * p_stats;
-    vlc_t *p_vlc = vlc_current_object( i_object );
-
@@ -943 +944 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
-
-    /*

src/misc/objects.c

@@ -217 +217 @@
-            psz_type = "osd menu";
-            break;
-        case VLC_OBJECT_STATS:
-            i_size = sizeof( stats_handler_t );
-            psz_type = "statistics";
-            break;
-        default:
-            i_size = i_type > (int)sizeof(vlc_object_t)

src/misc/stats.c

@@ -33 +33 @@
- * Local prototypes
- *****************************************************************************/
-
-
-
-
-
-
-
-
+
+
+
-static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, vlc_bool_t);
-
@@ -48 +43 @@
-
-/**
- * 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 i_type the type of stored data. One of VLC_VAR_STRING,
- * VLC_VAR_INTEGER, VLC_VAR_FLOAT
@@ -83 +52 @@
- * (keep a time derivative of the value)
- */
-int __stats_Create( vlc_object_t *p_this, const char *psz_name, unsigned int i_id
-
+counter_t * __stats_CounterCreate( vlc_object_t *p_this
+               
-{
-    counter_t *p_counter;
-
-
-
-
-
-
-
-
+
-
-    p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
-
-    p_counter->psz_name = strdup( psz_name );
-    p_counter->i_index = ((uint64_t)p_this->i_object_id << 32 ) + i_id;
-    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;
-
-
-
-
-
-
-
-
+
-}
-
-/** Update a counter element with new values
-the object in which to update
-sz_name the nam
+a VLC object
+_counter the counter to updat
- * \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
- */
-unsigned int i
+counter_t *p
-                    vlc_value_t val, vlc_value_t *val_new )
-{
-    int i_ret;
-    counter_t *p_counter;
-    stats_handler_t *p_handler;
-
-    if( !p_this->p_libvlc->b_stats ) return VLC_EGENERIC;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-/** Get the aggregated value for a counter
- * \param p_this an object
-
-
+
- * \param val a pointer to an initialized vlc_value union. It will contain the
- * retrieved value
- * \return an error code
- */
-
-
-
-
-
-
+
+
-    if( !p_this->p_libvlc->b_stats ) return VLC_EGENERIC;
-
-    /* Get stats handler singleton */
-    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, i_counter );
-    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 );