Changeset 26d5b73864aea7f4e6d01dba654235cb1accdf84

Timestamp:

02/04/06 12:04:42 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[f8cac3e17afff983a591fbe2bf0cc101b53ae624]

git-author:

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

Message:

* Avoid useless stats_Get calls
* Reduce vlc_object_find calls

Files:

• NEWS (modified) (2 diffs)
• include/main.h (modified) (1 diff)
• include/vlc_messages.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (2 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) (5 diffs)
• src/input/es_out.c (modified) (1 diff)
• src/input/stream.c (modified) (4 diffs)
• src/libvlc.c (modified) (1 diff)
• src/misc/hashtables.c (modified) (1 diff)
• src/misc/stats.c (modified) (9 diffs)
• src/network/httpd.c (modified) (2 diffs)
• src/stream_output/stream_output.c (modified) (1 diff)
• src/video_output/video_output.c (modified) (3 diffs)

NEWS

@@ -5 +5 @@
-
-Core support:
+ * Statistics collection (bitrates, packets, connections, ...)
-
-Input:
@@ -50 +51 @@
-
-Developers:
+ * New libvlc API (not finished yet)
- * Java bindings
-
-
-
-
-Changes between 0.8.4 and 0.8.4a:

include/main.h

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

include/vlc_messages.h

@@ -250 +250 @@
-VLC_EXPORT( void, stats_HandlerDestroy, (stats_handler_t*) );
-
-) __stats_Update( VLC_OBJECT( a ), b, c
-
+, d) __stats_Update( VLC_OBJECT( a ), b, c, d
+, vlc_value_t *
-#define stats_Create( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d )
-VLC_EXPORT( int, __stats_Create, (vlc_object_t*, const char *, int, int) );
@@ -278 +278 @@
-    return i_ret;
-}
- ) __stats_UpdateInteger( VLC_OBJECT(a),b,c
+,d ) __stats_UpdateInteger( VLC_OBJECT(a),b,c,d
-static inline int __stats_UpdateInteger( vlc_object_t *p_obj,
-
-
+
+
+
-    vlc_value_t val;
+    vlc_value_t new_val;
-    val.i_int = i;
-
-
-
+
+
+
+
+
+
-static inline int __stats_UpdateFloat( vlc_object_t *p_obj,
-
+, float *pf_new
-{
-    vlc_value_t val;
+    int i_ret;
+    vlc_value_t new_val;
-    val.f_float = f;
-
+
+
+
+
-}
-

include/vlc_symbols.h

@@ -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);
-
+, vlc_value_t *
-int __stats_Get (vlc_object_t*, int, const char *, vlc_value_t*);
-char* httpd_ClientIP (httpd_client_t *cl, char *psz_ip);
@@ -898 +898 @@
-    void (*__intf_UserHide_inner) (vlc_object_t *, int);
-    int (*__stats_Create_inner) (vlc_object_t*, const char *, int, int);
-
+, vlc_value_t *
-    int (*__stats_Get_inner) (vlc_object_t*, int, const char *, vlc_value_t*);
-    void (*stats_ComputeInputStats_inner) (input_thread_t*, input_stats_t*);

modules/stream_out/transcode.c

@@ -1329 +1329 @@
-                                                          &in )) )
-    {
-
+, NULL
-        if( p_sys->b_master_sync )
-        {
@@ -1732 +1732 @@
-    {
-        subpicture_t *p_subpic = 0;
-
+, NULL
-
-        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 )
-        {
-
+
+
-        }
-        aout_BufferFree( p_buffer );
@@ -368 +369 @@
-    {
-        stats_UpdateInteger( p_input->p_input_thread,
-
+, NULL
-    }
-    vlc_mutex_unlock( &p_aout->mixer_lock );

src/audio_output/input.c

@@ -448 +448 @@
-        if( p_input->p_input_thread )
-        {
-
+
+
-        }
-    }
@@ -460 +461 @@
-        if( p_input->p_input_thread )
-        {
-
+
+
-        }
-        aout_BufferFree( p_buffer );
@@ -501 +503 @@
-        if( p_input->p_input_thread )
-        {
-
+
+
-        }
-        return 0;

src/input/decoder.c

@@ -628 +628 @@
-                                                       &p_packetized_block )) )
-                    {
-
+, NULL
-                        /* 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 +652 @@
-        else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
-        {
-
+, NULL
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
@@ -699 +699 @@
-                    {
-                        stats_UpdateInteger( p_dec->p_parent, "decoded_video",
-
+, NULL
-                        if( p_dec->p_owner->i_preroll_end > 0 &&
-                            p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -720 +720 @@
-        else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
-        {
-
+, NULL
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -740 +740 @@
-        while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
-        {
-
+, NULL
-            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 )
-    {
-
-
-
-
+
+
+
-    }
-

src/input/stream.c

@@ -1581 +1581 @@
-    {
-        i_read = p_access->pf_read( p_access, p_read, i_read );
-
-
-
+
+
-        stats_UpdateFloat( s->p_parent->p_parent , "input_bitrate",
-(float)i_total
-
+ (float)i_total, NULL
+, NULL
-        return i_read;
-    }
@@ -1615 +1614 @@
-
-    /* Update read bytes in input */
-
-
-
+
+
-    stats_UpdateFloat( s->p_parent->p_parent , "input_bitrate",
-
-
+, NULL
+, NULL
-    return i_read;
-}
@@ -1639 +1637 @@
-        {
-            stats_UpdateInteger( s->p_parent->p_parent, "read_bytes",
-
-
-
+
-            stats_UpdateFloat( s->p_parent->p_parent , "input_bitrate",
-
-
+, NULL
+, NULL
-        }
-        return p_block;
@@ -1676 +1672 @@
-    {
-        stats_UpdateInteger( s->p_parent->p_parent, "read_bytes",
-
-
-
+
-        stats_UpdateFloat( s->p_parent->p_parent , "input_bitrate",
-
-
+, NULL
+, NULL
-    }
-

src/libvlc.c

@@ -692 +692 @@
-
-    libvlc.b_stats = config_GetInt( p_vlc, "stats" );
+    libvlc.p_stats = NULL;
-
-    /*

src/misc/hashtables.c

@@ -219 +219 @@
-    }
-
-
+(uint64_t)
-
-    return i_hash;

src/misc/stats.c

@@ -37 +37 @@
-static int stats_CounterUpdate( stats_handler_t *p_handler,
-                                counter_t *p_counter,
-
+, vlc_value_t *
-static stats_handler_t* stats_HandlerCreate( vlc_object_t *p_this );
-static stats_handler_t *stats_HandlerGet( vlc_object_t *p_this );
@@ -127 +127 @@
- */
-int __stats_Update( vlc_object_t *p_this, const char *psz_name,
-
+, vlc_value_t *val_new
-{
-    int i_ret;
@@ -152 +152 @@
-    }
-
-
+, val_new
-    vlc_mutex_unlock( &p_handler->object_lock );
-
@@ -493 +493 @@
-static int stats_CounterUpdate( stats_handler_t *p_handler,
-                                counter_t *p_counter,
-
+, vlc_value_t *new_val
-{
-    switch( p_counter->i_compute_type )
@@ -545 +545 @@
-                }
-                p_counter->pp_samples[0]->value = val;
+                *new_val = p_counter->pp_samples[0]->value;
-            }
-        }
@@ -597 +598 @@
-            {
-            case VLC_VAR_INTEGER:
+                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:
-
-
+
+
+
-            default:
-                msg_Err( p_handler, "Trying to increment invalid variable %s",
@@ -622 +628 @@
-static stats_handler_t *stats_HandlerGet( vlc_object_t *p_this )
-{
-
-
-
+
-    if( !p_handler )
-    {
@@ -632 +636 @@
-            return NULL;
-        }
-    vlc_object_yield( p_handler );
-}
+}
+vlc_object_yield( p_handler );
-    return p_handler;
-}
@@ -658 +662 @@
-    }
-    p_handler->i_counters = 0;
-5
+4
-
-    /// \bug is it p_vlc or p_libvlc ?
-    vlc_object_attach( p_handler, p_this->p_vlc );
+
+    p_this->p_libvlc->p_stats = p_handler;
-
-    return p_handler;

src/network/httpd.c

@@ -2107 +2107 @@
-            {
-                httpd_ClientClean( cl );
-
+, NULL
-                TAB_REMOVE( host->i_client, host->client, cl );
-                free( cl );
@@ -2561 +2561 @@
-                    {
-                        httpd_client_t *cl;
-
-
+
+
+
+
-                        cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );
-                        p_tls = NULL;

src/stream_output/stream_output.c

@@ -382 +382 @@
-        if( p_input )
-        {
-
+, NULL
-            stats_UpdateInteger( p_input, "sout_sent_bytes",
-
-
-
-
-
-
+
+
+
-            p_access->i_sent_bytes = 0;
-            vlc_object_release( p_input );

src/video_output/video_output.c

@@ -815 +815 @@
-                msg_Warn( p_vout, "late picture skipped ("I64Fd")",
-                                  current_date - display_date );
-
+, NULL
-                vlc_mutex_unlock( &p_vout->picture_lock );
-
@@ -838 +838 @@
-                    p_vout->i_heap_size--;
-                }
-
+, NULL
-                msg_Warn( p_vout, "vout warning: early picture skipped "
-                          "("I64Fd")", display_date - current_date
@@ -896 +896 @@
-         * Perform rendering
-         */
-
+, NULL
-        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
-