Changeset 0b44cb999e661507876710e271a58b800e7db068

Timestamp:

02/04/06 17:26:23 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[b41bfdb8bbb2c14e3313ce1f89c3f880ca93fd6f]

git-author:

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

Message:

Stop using strings to index stats, use integers. The list is not sorted yet, though

Files:

• include/vlc_messages.h (modified) (11 diffs)
• include/vlc_symbols.h (modified) (8 diffs)
• modules/stream_out/transcode.c (modified) (2 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) (1 diff)
• src/input/stream.c (modified) (4 diffs)
• src/misc/stats.c (modified) (22 diffs)
• src/network/httpd.c (modified) (3 diffs)
• src/playlist/playlist.c (modified) (3 diffs)
• src/stream_output/stream_output.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (4 diffs)

include/vlc_messages.h

@@ -229 +229 @@
-struct counter_t
-{
+    /* The list is *NOT* sorted at the moment, it could be ... */
+    uint64_t            i_index;
-    char              * psz_name;
-source_object
+type
-    int                 i_compute_type;
-    int                 i_type;
-    int                 i_samples;
-    counter_sample_t ** pp_samples;
@@ -240 +241 @@
-};
-
+enum
+{
+    STATS_INPUT_BITRATE,
+    STATS_READ_BYTES,
+    STATS_READ_PACKETS,
+    STATS_DEMUX_READ,
+    STATS_DEMUX_BITRATE,
+    STATS_PLAYED_ABUFFERS,
+    STATS_LOST_ABUFFERS,
+    STATS_DECODED_AUDIO,
+    STATS_DECODED_VIDEO,
+    STATS_DECODED_SUB,
+    STATS_CLIENT_CONNECTIONS,
+    STATS_ACTIVE_CONNECTIONS,
+    STATS_SOUT_SENT_PACKETS,
+    STATS_SOUT_SENT_BYTES,
+    STATS_SOUT_SEND_BITRATE,
+    STATS_DISPLAYED_PICTURES,
+    STATS_LOST_PICTURES,
+
+    STATS_TIMER_PLAYLIST_WALK,
+    STATS_TIMER_INTERACTION,
+    STATS_TIMER_PREPARSE
+};
+
-struct stats_handler_t
-{
@@ -245 +271 @@
-
-    int                 i_counters;
-hashtable_entry_t * 
+counter_t         **p
-};
-
@@ -251 +277 @@
-
-#define stats_Update( a,b,c, d) __stats_Update( VLC_OBJECT( a ), b, c, d )
-const char *
- ) __stats_Create( VLC_OBJECT(a), b, c, d
-
+unsigned int
+,e ) __stats_Create( VLC_OBJECT(a), b, c, d,e
+unsigned int, 
-#define stats_Get( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d )
-const char *
+unsigned int
-#define stats_CounterGet( a,b,c) __stats_CounterGet( VLC_OBJECT(a), b, c )
-const char *
+unsigned int
-
-#define stats_GetInteger( a,b,c,d ) __stats_GetInteger( VLC_OBJECT(a), b, c, d )
-static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id,
-const char *psz_name
+unsigned int i_counter
-{
-    vlc_value_t val;
-psz_name
+i_counter
-    *value = val.i_int;
-    return i_ret;
@@ -271 +297 @@
-#define stats_GetFloat(a,b,c,d ) __stats_GetFloat( VLC_OBJECT(a), b, c, d )
-static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id,
-const char *psz_name
+unsigned int i_counter
-{
-    vlc_value_t val;
-psz_name
+i_counter
-    *value = val.f_float;
-    return i_ret;
@@ -280 +306 @@
-#define stats_UpdateInteger( a,b,c,d ) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
-static inline int __stats_UpdateInteger( vlc_object_t *p_obj,
-
+
+
-{
-    int i_ret;
@@ -286 +313 @@
-    vlc_value_t new_val;
-    val.i_int = i;
-psz_name
+i_counter
-    if( pi_new )
-        *pi_new = new_val.i_int;
@@ -293 +320 @@
-#define stats_UpdateFloat( a,b,c,d ) __stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
-static inline int __stats_UpdateFloat( vlc_object_t *p_obj,
-
+
+
-{
-    vlc_value_t val;
@@ -299 +327 @@
-    vlc_value_t new_val;
-    val.f_float = f;
-psz_name
+i_counter
-    if( pf_new )
-        *pf_new = new_val.f_float;
@@ -369 +397 @@
- ********/
-#ifdef DEBUG
-) __stats_TimerStart( VLC_OBJECT(a), b
+,c) __stats_TimerStart( VLC_OBJECT(a), b,c
-#define stats_TimerStop(a,b) __stats_TimerStop( VLC_OBJECT(a), b )
-#define stats_TimerDump(a,b) __stats_TimerDump( VLC_OBJECT(a), b )
@@ -379 +407 @@
-#define stats_TimersDumpAll(a) {}
-#endif
-
-const char *
-const char *
+, unsigned int 
+unsigned int
+unsigned int
-VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) );

include/vlc_symbols.h

@@ -66 +66 @@
-httpd_url_t * httpd_UrlNewUnique (httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl);
-void httpd_ClientModeStream (httpd_client_t *cl);
-
+unsigned int, 
-void httpd_RedirectDelete (httpd_redirect_t *);
-void __sout_CfgParse (vlc_object_t *, char *psz_prefix, const char **ppsz_options, sout_cfg_t *);
@@ -125 +125 @@
-int playlist_Delete (playlist_t *, int);
-void aout_FiltersPlay (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters, aout_buffer_t ** pp_input_buffer);
-const char *
-const char *
+unsigned int
+int
-char* httpd_ClientIP (httpd_client_t *cl, char *psz_ip);
-int __intf_UserProgress (vlc_object_t*, const char*, const char*, float);
@@ -140 +140 @@
-int vout_ShowTextRelative (vout_thread_t *, int, char *, text_style_t *, int, int, int, mtime_t);
-unsigned int update_iterator_Action (update_iterator_t *, int);
-const char *
+unsigned int
-int block_FifoPut (block_fifo_t *, block_t *);
-int playlist_ItemAddParent (playlist_item_t *, int,playlist_item_t *);
@@ -152 +152 @@
-char * config_GetUserDir (void);
-httpd_stream_t * httpd_StreamNew (httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl);
-const char *
+unsigned int
-int __config_GetType (vlc_object_t *, const char *);
-void __vlc_thread_ready (vlc_object_t *);
@@ -207 +207 @@
-void AddMD5 (struct md5_s *, const uint8_t *, uint32_t);
-void config_Duplicate (module_t *, module_config_t *);
-
+, int
-block_t * __block_New (vlc_object_t *, int);
-void xml_Delete (xml_t *);
@@ -426 +426 @@
-void __vout_OSDMessage (vlc_object_t *, int, char *, ...);
-void intf_StopThread (intf_thread_t *);
-const char *
+unsigned int
-stream_t * __stream_MemoryNew (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, vlc_bool_t i_preserve_memory);
-void mwait (mtime_t date);
@@ -897 +897 @@
-    void (*__intf_UserProgressUpdate_inner) (vlc_object_t*, int, const char*, float);
-    void (*__intf_UserHide_inner) (vlc_object_t *, int);
-
-const char *
-const char *
+unsigned int, 
+unsigned int
+int
-    void (*stats_ComputeInputStats_inner) (input_thread_t*, input_stats_t*);
-    void (*stats_DumpInputStats_inner) (input_stats_t *);
-    void (*stats_ReinitInputStats_inner) (input_stats_t *);
-const char *
+unsigned int
-    void *__stats_CounterGet_deprecated;
-    input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
@@ -910 +910 @@
-    void (*__var_OptionParse_inner) (vlc_object_t *, const char *);
-    void *__stats_TimerDumpAll_deprecated;
-const char *
-
+unsigned int
+, int
-    void (*__stats_ComputeGlobalStats_inner) (vlc_object_t*,global_stats_t*);
-const char *
+unsigned int
-    void (*__stats_TimersDumpAll_inner) (vlc_object_t*);
-    update_iterator_t * (*update_iterator_New_inner) (update_t *);

modules/stream_out/transcode.c

@@ -1329 +1329 @@
-                                                          &in )) )
-    {
-
+
+
-        if( p_sys->b_master_sync )
-        {
@@ -1732 +1733 @@
-    {
-        subpicture_t *p_subpic = 0;
-
+
+
-
-        if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )

src/audio_output/dec.c

@@ -313 +313 @@
-        if( p_input->p_input_thread )
-        {
-"lost_abuffers"
+STATS_LOST_ABUFFERS
-                                 NULL );
-        }
@@ -369 +369 @@
-    {
-        stats_UpdateInteger( p_input->p_input_thread,
-"played_abuffers"
+ STATS_PLAYED_ABUFFERS
-    }
-    vlc_mutex_unlock( &p_aout->mixer_lock );

src/audio_output/input.c

@@ -448 +448 @@
-        if( p_input->p_input_thread )
-        {
-"lost_abuffers"
+STATS_LOST_ABUFFERS
-                                 NULL );
-        }
@@ -461 +461 @@
-        if( p_input->p_input_thread )
-        {
-"lost_abuffers"
+STATS_LOST_ABUFFERS
-                                 NULL );
-        }
@@ -503 +503 @@
-        if( p_input->p_input_thread )
-        {
-"lost_abuffers"
+STATS_LOST_ABUFFERS
-                                 NULL );
-        }

src/input/decoder.c

@@ -430 +430 @@
-    vlc_object_attach( p_dec, p_input );
-
-
+ STATS_DECODED_AUDIO,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-
+ STATS_DECODED_VIDEO,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-
+ STATS_DECODED_SUB,
-                  VLC_VAR_INTEGER, STATS_COUNTER );
-    /* Find a suitable decoder/packetizer module */
@@ -628 +628 @@
-                                                       &p_packetized_block )) )
-                    {
-
+
+
-                        /* FIXME the best would be to handle the case start_date < preroll < end_date
-                         * but that's not easy with non raw audio stream */
@@ -652 +653 @@
-        else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
-        {
-"decoded_audio"
+STATS_DECODED_AUDIO
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
@@ -698 +699 @@
-                                                       &p_packetized_block )) )
-                    {
-"decoded_video"
+STATS_DECODED_VIDEO
-                                                             1, NULL );
-                        if( p_dec->p_owner->i_preroll_end > 0 &&
@@ -720 +721 @@
-        else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
-        {
-"decoded_video"
+STATS_DECODED_VIDEO
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -740 +741 @@
-        while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
-        {
-"decoded_sub"
+STATS_DECODED_SUB
-            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

@@ -1034 +1034 @@
-    if( p_input->p_libvlc->b_stats )
-    {
-"demux_read"
+STATS_DEMUX_READ
-                             &i_total );
-"demux_bitrate"
+STATS_DEMUX_BITRATE
-    }
-

src/input/input.c

@@ -686 +686 @@
-        /* Prepare statistics */
-        counter_t *p_counter;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        p_counter = stats_CounterGet( p_input, p_input->i_object_id,
-"input_bitrate"
+STATS_INPUT_BITRATE
-        if( p_counter ) p_counter->update_interval = 1000000;
-        p_counter = stats_CounterGet( p_input, p_input->i_object_id,
-"demux_bitrate"
+STATS_DEMUX_BITRATE
-        if( p_counter ) p_counter->update_interval = 1000000;
-
-
-
+
+
+
+
-
-        /* handle sout */

src/input/stream.c

@@ -1581 +1581 @@
-    {
-        i_read = p_access->pf_read( p_access, p_read, i_read );
-"read_bytes"
+STATS_READ_BYTES
-                             &i_total );
-"input_bitrate"
+STATS_INPUT_BITRATE
-                           (float)i_total, NULL );
-
+
+
-        return i_read;
-    }
@@ -1614 +1615 @@
-
-    /* Update read bytes in input */
-"read_bytes"
+ STATS_READ_BYTES
-                         &i_total );
-"input_bitrate"
+ STATS_INPUT_BITRATE
-                      (float)i_total, NULL );
-"read_packets"
+ STATS_READ_PACKETS
-    return i_read;
-}
@@ -1636 +1637 @@
-        if( p_block && p_access->p_libvlc->b_stats )
-        {
-"read_bytes"
+ STATS_READ_BYTES
-                                 p_block->i_buffer, &i_total );
-"input_bitrate"
+ STATS_INPUT_BITRATE
-                              (float)i_total, NULL );
-"read_packets"
+ STATS_READ_PACKETS
-        }
-        return p_block;
@@ -1671 +1672 @@
-    if( p_block )
-    {
-"read_bytes"
+ STATS_READ_BYTES
-                             p_block->i_buffer, &i_total );
-"input_bitrate"
+ STATS_INPUT_BITRATE
-                          (float)i_total, NULL );
-
+
+
-    }
-

src/misc/stats.c

@@ -34 +34 @@
- *****************************************************************************/
-static counter_t *GetCounter( stats_handler_t *p_handler, int i_object_id,
-const char *psz_name
+unsigned int i_counter
-static int stats_CounterUpdate( stats_handler_t *p_handler,
-                                counter_t *p_counter,
@@ -58 +58 @@
-    {
-        int j;
-
-
+
-
-        for( j = p_counter->i_samples -1; j >= 0 ; j-- )
@@ -68 +67 @@
-        }
-        free( p_counter->psz_name );
-
-
+
-        free( p_counter );
-    }
@@ -85 +83 @@
- * (keep a time derivative of the value)
- */
-int i_type
-
+unsigned int i_id
+type, int i_
-{
-    counter_t *p_counter;
@@ -103 +101 @@
-
-    p_counter->psz_name = strdup( psz_name );
-source_object = p_this->i_object
+index = ((uint64_t)p_this->i_object_id << 32 ) + i
-    p_counter->i_compute_type = i_compute_type;
-    p_counter->i_type = i_type;
@@ -112 +110 @@
-    p_counter->last_update = 0;
-
-vlc_HashInsert( &p_handler->p_counters, &p_handler->i_counters, p_this->i_object_id
-   psz_name
+INSERT_ELEM( p_handler->pp_counters, p_handler->i_counters
+p_handler->i_counters
-
-    vlc_mutex_unlock( &p_handler->object_lock );
@@ -126 +124 @@
- * more information on how data is aggregated, \see __stats_Create
- */
-const char *psz_name
+unsigned int i_counter
-                    vlc_value_t val, vlc_value_t *val_new )
-{
@@ -143 +141 @@
-    vlc_mutex_lock( &p_handler->object_lock );
-    /* Look for existing element */
-
-
+
-    if( !p_counter )
-    {
@@ -167 +164 @@
- */
-int __stats_Get( vlc_object_t *p_this, int i_object_id,
-const char *psz_name
+unsigned int i_counter
-{
-    counter_t *p_counter;
@@ -182 +179 @@
-
-    /* Look for existing element */
-
-
+
-    if( !p_counter )
-    {
@@ -246 +242 @@
- */
-counter_t *__stats_CounterGet( vlc_object_t *p_this, int i_object_id,
-const char *psz_name
+unsigned int i_counter
-{
-    counter_t *p_counter;
@@ -261 +257 @@
-
-    /* Look for existing element */
-
-
+
-    vlc_mutex_unlock( &p_handler->object_lock );
-    vlc_object_release( p_handler );
@@ -279 +274 @@
-
-    /* Input */
-"read_packets"
+STATS_READ_PACKETS
-                       &p_stats->i_read_packets );
-"read_bytes"
+STATS_READ_BYTES
-                       &p_stats->i_read_bytes );
-"input_bitrate"
+STATS_INPUT_BITRATE
-                       &p_stats->f_input_bitrate );
-
-"demux_read"
+STATS_DEMUX_READ
-                      &p_stats->i_demux_read_bytes );
-"demux_bitrate"
+STATS_DEMUX_BITRATE
-                      &p_stats->f_demux_bitrate );
-
-"decoded_video"
+STATS_DECODED_VIDEO
-                      &p_stats->i_decoded_video );
-"decoded_audio"
+STATS_DECODED_AUDIO
-                      &p_stats->i_decoded_audio );
-
-    /* Sout */
-"sout_sent_packets"
+STATS_SOUT_SENT_PACKETS
-                      &p_stats->i_sent_packets );
-"sout_sent_bytes"
+STATS_SOUT_SENT_BYTES
-                      &p_stats->i_sent_bytes );
-"sout_send_bitrate"
+STATS_SOUT_SEND_BITRATE
-                      &p_stats->f_send_bitrate );
-
-    /* Aout - We store in p_input because aout is shared */
-"played_abuffers"
+STATS_PLAYED_ABUFFERS
-                      &p_stats->i_played_abuffers );
-"lost_abuffers"
+STATS_LOST_ABUFFERS
-                      &p_stats->i_lost_abuffers );
-
@@ -320 +315 @@
-            int i_displayed = 0, i_lost = 0;
-            p_obj = (vlc_object_t *)p_list->p_values[i_index].p_object;
-
+
+
-                              &i_displayed );
-"lost_pictures"
+STATS_LOST_PICTURES
-                              &i_lost );
-            p_stats->i_displayed_pictures += i_displayed;
@@ -352 +348 @@
-    /* f_bitrate is in bytes / microsecond
-     * *1000 => bytes / millisecond => kbytes / seconds */
-
-
+
+
+
-                    p_stats->i_read_packets, p_stats->i_read_bytes,
-                    p_stats->f_input_bitrate * 1000,
@@ -379 +376 @@
-            float f_in = 0, f_out = 0, f_demux = 0;
-            p_obj = (vlc_object_t *)p_list->p_values[i_index].p_object;
-"input_bitrate"
+STATS_INPUT_BITRATE
-                            &f_in );
-"sout_send_bitrate"
+STATS_SOUT_SEND_BITRATE
-                            &f_out );
-"demux_bitrate"
+STATS_DEMUX_BITRATE
-                            &f_demux );
-            f_total_in += f_in; f_total_out += f_out;f_total_demux += f_demux;
@@ -402 +399 @@
-
-
-
+
+
-{
-    counter_t *p_counter = stats_CounterGet( p_obj,
-
-
+
-    if( !p_counter )
-    {
-        counter_sample_t *p_sample;
-
+i_id, 
-        p_counter = stats_CounterGet( p_obj,  p_obj->p_vlc->i_object_id,
-psz_name
+i_id
-        if( !p_counter ) return;
-        /* 1st sample : if started: start_date, else last_time, b_started */
@@ -434 +431 @@
-}
-
-const char *psz_name
+unsigned int i_id
-{
-    counter_t *p_counter = stats_CounterGet( p_obj,
- 
-psz_name
+
+i_id
-    if( !p_counter || p_counter->i_samples != 2 )
-    {
-%s does not exist", psz_name
+does not exist"
-        return;
-    }
@@ -450 +447 @@
-}
-
-const char *psz_name
+unsigned int i_id
-{
-    counter_t *p_counter = stats_CounterGet( p_obj,
-                                             p_obj->p_vlc->i_object_id,
-psz_name
+i_id
-    TimerDump( p_obj, p_counter, VLC_TRUE );
-}
@@ -468 +465 @@
-    for ( i = 0 ; i< p_handler->i_counters; i++ )
-    {
-(counter_t *)(p_handler->p_counters[i].p_data)
+p_handler->pp_counters[i]
-        if( p_counter->i_compute_type == STATS_TIMER )
-        {
@@ -618 +615 @@
-
-static counter_t *GetCounter( stats_handler_t *p_handler, int i_object_id,
-const char *psz_name
+unsigned int i_counter
-{
-    int i;
-
-
+
+
+
+
+
+
+
-}
-
@@ -662 +664 @@
-    }
-    p_handler->i_counters = 0;
-_counters = (hashtable_entry_t *) malloc( 4 * sizeof( variable_t ) )
+p_counters = NULL
-
-    /// \bug is it p_vlc or p_libvlc ?

src/network/httpd.c

@@ -2056 +2056 @@
-    tls_session_t *p_tls = NULL;
-
-
-
+
+
+
+
-
-    while( !host->b_die )
@@ -2107 +2109 @@
-            {
-                httpd_ClientClean( cl );
-"active_connections"
+STATS_ACTIVE_CONNECTIONS
-                TAB_REMOVE( host->i_client, host->client, cl );
-                free( cl );
@@ -2561 +2563 @@
-                    {
-                        httpd_client_t *cl;
-"client_connections", 1
-
-"active_connections"
+STATS_CLIENT_CONNECTIONS
+1, 
+STATS_ACTIVE_CONNECTIONS
-                                             NULL );
-                        cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );

src/playlist/playlist.c

@@ -599 +599 @@
-        if( p_playlist->p_interaction )
-        {
-
+
+
-            intf_InteractionManage( p_playlist );
-"Interaction thread"
+STATS_TIMER_INTERACTION
-        }
-
@@ -713 +714 @@
-            /* Start another input.
-             * Get the next item to play */
-
+