Changeset 8923568d00bddb39e34f82ee8b62152389321b77

Timestamp:

09/15/06 17:10:25 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[f485214f09dd284cbb85674e937fbbb0a6032a2e]

git-author:

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

Message:

Move stats stuff to the per-instance object

Files:

• include/main.h (modified) (2 diffs)
• src/input/es_out.c (modified) (1 diff)
• src/input/input.c (modified) (3 diffs)
• src/input/stream.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/misc/stats.c (modified) (13 diffs)
• src/stream_output/stream_output.c (modified) (1 diff)

include/main.h

@@ -48 +48 @@
-
-    module_bank_t *        p_module_bank; ///< The module bank
-
-    vlc_bool_t             b_stats;       ///< Should we collect stats
-    /* Timers handling */
-    vlc_mutex_t            timer_lock;    ///< Lock to protect timers
-    int                    i_timers;      ///< Number of timers
-    counter_t            **pp_timers;     ///< Array of all timers
-
-    intf_thread_t         *p_probe;       ///< Devices prober
-
@@ -99 +92 @@
-    void* ( *pf_memset ) ( void *, int, size_t );
-
-
-
+
+
+
+
+
+
-
-    /* Locks */

src/input/es_out.c

@@ -1027 +1027 @@
-        i_delay = 0;
-
-_global
+
-    {
-        vlc_mutex_lock( &p_input->counters.counters_lock );

src/input/input.c

@@ -686 +686 @@
-#define INIT_COUNTER( p, type, compute ) p_input->counters.p_##p = \
-     stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
-_global
+
-        {
-            INIT_COUNTER( read_bytes, INTEGER, COUNTER );
@@ -722 +722 @@
-                return VLC_EGENERIC;
-            }
-_global
+
-            {
-                INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
@@ -1115 +1115 @@
-
-#define CL_CO( c ) stats_CounterClean( p_input->counters.p_##c ); p_input->counters.p_##c = NULL;
-_global
+
-    {
-        vlc_mutex_lock( &p_input->counters.counters_lock );

src/input/stream.c

@@ -1656 +1656 @@
-        p_block = p_access->pf_block( p_access );
-        if( pb_eof ) *pb_eof = p_access->info.b_eof;
-_global
+
-        {
-            vlc_object_yield( p_input );

src/libvlc.c

@@ -715 +715 @@
-    }
-
-libvlc_global.
-libvlc_global.
-libvlc_global.
-libvlc_global.
+p_libvlc->
+p_libvlc->
+p_libvlc->
+p_libvlc->
-
-    /*

src/misc/stats.c

@@ -79 +79 @@
-                    vlc_value_t val, vlc_value_t *val_new )
-{
-_global
+
-    return CounterUpdate( p_this, p_counter, val, val_new );
-}
@@ -92 +92 @@
-int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
-{
-_global
+
-    {
-        val->i_int = val->f_float = 0.0;
@@ -136 +136 @@
-void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *p_stats )
-{
-_global
+
-
-    vlc_mutex_lock( &p_input->counters.counters_lock );
@@ -224 +224 @@
-    int i_index;
-
-_global
+
-
-    vlc_mutex_lock( &p_stats->lock );
@@ -269 +269 @@
-    int i;
-    counter_t *p_counter = NULL;
-_global
-_global
-
-_global
-
-_global
-
-_global
+
+
+
+
+
+
+
+
-            break;
-        }
@@ -287 +287 @@
-        if( !p_counter )
-        {
-_global
+
-            return;
-        }
-        p_counter->psz_name = strdup( psz_name );
-        p_counter->i_id = i_id;
-_global->pp_timers, p_obj->p_libvlc_global
-_global
+->pp_timers, p_obj->p_libvlc
+
-
-        /* 1st sample : if started: start_date, else last_time, b_started */
@@ -309 +309 @@
-    {
-        msg_Warn( p_obj, "timer %s was already started !", psz_name );
-_global
+
-        return;
-    }
-    p_counter->pp_samples[0]->value.b_bool = VLC_TRUE;
-    p_counter->pp_samples[0]->date = mdate();
-_global
+
-}
-
@@ -321 +321 @@
-    counter_t *p_counter = NULL;
-    int i;
-_global
-_global
-_global
-
-_global
-
-_global
+
+
+
+
+
+
+
-            break;
-        }
@@ -334 +334 @@
-    {
-        msg_Err( p_obj, "timer does not exist" );
-_global
+
-        return;
-    }
@@ -341 +341 @@
-    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;
-_global
+
-}
-
@@ -348 +348 @@
-    counter_t *p_counter = NULL;
-    int i;
-_global
-_global
-_global
-
-_global
-
-_global
+
+
+
+
+
+
+
-            break;
-        }
-    }
-    TimerDump( p_obj, p_counter, VLC_TRUE );
-_global
+
-}
-
@@ -365 +365 @@
-{
-    int i;
-_global
-_global
-_global
-_global
-_global
+
+
+
+
+
-}
-
@@ -375 +375 @@
-{
-    int i;
-_global
-_global
-
-_global
-_global->pp_timers, p_obj->p_libvlc_global
+
+
+
+
+->pp_timers, p_obj->p_libvlc
-        stats_CounterClean( p_counter );
-    }
-_global
+
-}
-

src/stream_output/stream_output.c

@@ -364 +364 @@
-    p_access->i_writes++;
-    p_access->i_sent_bytes += p_buffer->i_buffer;
-_global
+
-    {
-        /* Access_out -> sout_instance -> input_thread_t */