Changeset 03b059c1b6814784fa731a4687ad45b338fa91e8

Timestamp:

01/08/06 16:48:41 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[efacf7b59b10eace643aec90a54f10674e5c4712]

git-author:

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

Message:

Some more stats preliminary work

Files:

• include/vlc_messages.h (modified) (2 diffs)
• src/input/decoder.c (modified) (6 diffs)
• src/input/input.c (modified) (1 diff)
• src/input/stream.c (modified) (1 diff)
• src/libvlc.c (modified) (2 diffs)
• src/misc/stats.c (modified) (4 diffs)
• src/network/httpd.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (4 diffs)

include/vlc_messages.h

@@ -209 +209 @@
-    STATS_MAX,
-    STATS_MIN,
+    STATS_DERIVATIVE
-};
-
@@ -248 +249 @@
-}
-#define stats_UpdateInteger( a,b,c ) __stats_UpdateInteger( VLC_OBJECT(a),b,c )
+
+
+struct input_stats_t
+{
+    /* Input */
+    int i_read_packets;
+    int i_read_bytes;
+
+    float f_last_bitrate;
+    float f_average_bitrate;
+
+    /* Decoders */
+
+    /* Vout */
+    int i_displayed_pictures;
+    int i_lost_pictures;
+}

src/input/decoder.c

@@ -384 +384 @@
-    p_dec->pf_decode_sub = 0;
-    p_dec->pf_packetize = 0;
+
+    stats_Create( p_dec, "decoded_audio", VLC_VAR_INTEGER, STATS_COUNTER );
+    stats_Create( p_dec, "decoded_video", VLC_VAR_INTEGER, STATS_COUNTER );
+    stats_Create( p_dec, "decoded_sub", VLC_VAR_INTEGER, STATS_COUNTER );
-
-    /* Initialize the decoder fifo */
@@ -622 +626 @@
-                                                       &p_packetized_block )) )
-                    {
+                        stats_UpdateInteger( p_dec, "decoded_audio", 1 );
-                        /* FIXME the best would be to handle the case start_date < preroll < end_date
-                         * but that's not easy with non raw audio stream */
@@ -645 +650 @@
-        else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
-        {
+            stats_UpdateInteger( p_dec, "decoded_audio", 1 );
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
@@ -690 +696 @@
-                                                       &p_packetized_block )) )
-                    {
+                        stats_UpdateInteger( p_dec, "decoded_video", 1 );
-                        if( p_dec->p_owner->i_preroll_end > 0 &&
-                            p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -710 +717 @@
-        else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
-        {
+            stats_UpdateInteger( p_dec, "decoded_video", 1 );
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_pic->date < p_dec->p_owner->i_preroll_end )
@@ -729 +737 @@
-        while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
-        {
+            stats_UpdateInteger( p_dec, "decoded_sub", 1 );
-            if( p_dec->p_owner->i_preroll_end > 0 &&
-                p_spu->i_start < p_dec->p_owner->i_preroll_end &&

src/input/input.c

@@ -673 +673 @@
-    if( !b_quick )
-    {
+        stats_Create( p_input, "read_bytes", VLC_VAR_INTEGER, STATS_COUNTER );
+        stats_Create( p_input, "input_bitrate", VLC_VAR_FLOAT,
+                                                STATS_DERIVATIVE );
-        psz = var_GetString( p_input, "sout" );
-        if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )

src/input/stream.c

@@ -1597 +1597 @@
-    }
-
+    /* Update read bytes in input */
+    stats_UpdateInteger( s->p_parent, "read_bytes", i_read );
+
-    return i_read;
-}

src/libvlc.c

@@ -903 +903 @@
-    aout_instance_t    * p_aout;
-    announce_handler_t * p_announce;
+    stats_handler_t    * p_stats;
-    vlc_t *p_vlc = vlc_current_object( i_object );
-
@@ -955 +956 @@
-        vlc_object_release( (vlc_object_t *)p_aout );
-        aout_Delete( p_aout );
+    }
+
+    while( ( p_stats = vlc_object_find( p_vlc, VLC_OBJECT_STATS, FIND_CHILD) ))
+    {
+        vlc_object_detach( (vlc_object_t*) p_stats );
+        vlc_object_release( (vlc_object_t *)p_stats );
+        // TODO: Delete it
-    }
-

src/misc/stats.c

@@ -96 +96 @@
-    {
-    case STATS_LAST:
+    case STATS_MIN:
+    case STATS_LAST:
-        if( p_counter->i_samples > 1)
-        {
@@ -101 +103 @@
-            return VLC_EGENERIC;
-        }
+        if( p_counter->i_type != VLC_VAR_FLOAT &&
+            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");
+            return VLC_EGENERIC;
+        }
+
-        if( p_counter->i_samples == 0 )
-        {
@@ -112 +122 @@
-        if( p_counter->i_samples == 1 )
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-
+
+
+
+
+
+
-            }
-            p_counter->pp_samples[0]->value = val;
-        }
-        break;
+
-    case STATS_COUNTER:
-        if( p_counter->i_samples > 1)
@@ -217 +244 @@
-}
-
+
+void stats_ComputeInputStats( input_thread_t *p_input,
+                              input_stats_t *p_stats )
+{
+    int i;
+    /* read_packets and read_bytes are common to all streams */
+    p_stats->i_read_packets = stats_GetInteger( p_input, "read_packets" );
+    p_stats->i_read_bytes = stats_GetInteger( p_input, "read_bytes" );
+
+}

src/network/httpd.c

@@ -2060 +2060 @@
-
-    stats_Create( host, "client_connections", VLC_VAR_INTEGER, STATS_COUNTER );
+    stats_Create( host, "active_connections", VLC_VAR_INTEGER, STATS_COUNTER );
-
-    while( !host->b_die )
@@ -2109 +2110 @@
-            {
-                httpd_ClientClean( cl );
+                stats_UpdateInteger( host, "active_connections", -1 );
-                TAB_REMOVE( host->i_client, host->client, cl );
-                free( cl );
@@ -2564 +2566 @@
-                        stats_UpdateInteger( host, "client_connections",
-                                             1 );
+                        stats_UpdateInteger( host, "active_connections", 1 );
-                        cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );
-                        p_tls = NULL;

src/video_output/video_output.c

@@ -230 +230 @@
-    }
-
+    stats_Create( p_vout, "displayed_pictures", VLC_VAR_INTEGER,
+                                                 STATS_COUNTER );
+    stats_Create( p_vout, "lost_pictures", VLC_VAR_INTEGER, STATS_COUNTER );
+
-    /* Initialize pictures - translation tables and functions
-     * will be initialized later in InitThread */
@@ -811 +815 @@
-                msg_Warn( p_vout, "late picture skipped ("I64Fd")",
-                                  current_date - display_date );
+                stats_UpdateInteger( p_vout, "lost_pictures", 1 );
-                vlc_mutex_unlock( &p_vout->picture_lock );
-
@@ -833 +838 @@
-                    p_vout->i_heap_size--;
-                }
+                stats_UpdateInteger( p_vout, "lost_pictures", 1 );
-                msg_Warn( p_vout, "vout warning: early picture skipped "
-                          "("I64Fd")", display_date - current_date
@@ -890 +896 @@
-         * Perform rendering
-         */
+        stats_UpdateInteger( p_vout, "displayed_pictures", 1 );
-        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
-