Changeset e56193e811c52c1f0945524e47f0f9aa4069d5e0

Timestamp:

11/01/06 21:00:58 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[8ea1f62452eea001d536e23dc613cea5a4fd3d56]

git-author:

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

Message:

Misc stats work (Refs:#473)

Files:

• include/vlc_input.h (modified) (2 diffs)
• include/vlc_messages.h (modified) (4 diffs)
• include/vlc_symbols.h (modified) (7 diffs)
• src/input/input.c (modified) (2 diffs)
• src/input/stream.c (modified) (2 diffs)
• src/misc/stats.c (modified) (7 diffs)
• src/playlist/item.c (modified) (1 diff)
• src/playlist/playlist.c (modified) (1 diff)

include/vlc_input.h

@@ -65 +65 @@
-    vlc_bool_t  b_fixed_name;        /**< Can the interface change the name ?*/
-
+    input_stats_t *p_stats;          /**< Statistics */
+
-    vlc_mutex_t lock;                /**< Item cannot be changed without this lock */
-};
@@ -92 +94 @@
-    p_i->i_type = ITEM_TYPE_UNKNOWN;
-    p_i->b_fixed_name = VLC_TRUE;
+
+    p_i->p_stats = (input_stats_t*) malloc( sizeof( input_stats_t ) );
+    vlc_mutex_init( p_o, &p_i->p_stats->lock );
+
-    vlc_mutex_init( p_o, &p_i->lock );
-}

include/vlc_messages.h

@@ -26 +26 @@
-
-#include <stdarg.h>
+
+int vlc_mutex_lock(  vlc_mutex_t * ) ;
+int vlc_mutex_unlock(  vlc_mutex_t * ) ;
+
-/**
- * \defgroup messages Messages
@@ -240 +244 @@
-#define stats_Create( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d )
-VLC_EXPORT( int, __stats_Create, (vlc_object_t*, char *, int, int) );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static inline int __stats_UpdateInteger( vlc_object_t *p_obj, char *psz_name,
-                                         int i )
@@ -248 +265 @@
-    return __stats_Update( p_obj, psz_name, val );
-}
-#define stats_UpdateInteger( a,b,c ) __stats_UpdateInteger( VLC_OBJECT(a),b,c )
-
-
-struct input_stats_t
-{
+
+    vlc_mutex_t         lock;
+
-    /* Input */
-    int i_read_packets;
@@ -266 +285 @@
-    int i_lost_pictures;
-};
+
+VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) );
+VLC_EXPORT( void, stats_ReinitInputStats, (input_stats_t *) );
+VLC_EXPORT( void, stats_DumpInputStats, (input_stats_t *) );

include/vlc_symbols.h

@@ -30 +30 @@
-int playlist_ItemSetDuration (playlist_item_t *, mtime_t);
-void aout_Delete (aout_instance_t *);
+void stats_ComputeInputStats (input_thread_t*, input_stats_t*);
-int playlist_Control (playlist_t *, int, ...);
-vlc_acl_t * __ACL_Create (vlc_object_t *p_this, vlc_bool_t b_allow);
@@ -121 +122 @@
-void aout_FiltersPlay (aout_instance_t * p_aout, aout_filter_t ** pp_filters, int i_nb_filters, aout_buffer_t ** pp_input_buffer);
-int __stats_Update (vlc_object_t*, char *, vlc_value_t);
+int __stats_Get (vlc_object_t*, int, char *, vlc_value_t*);
-char* httpd_ClientIP (httpd_client_t *cl, char *psz_ip);
-int __intf_UserProgress (vlc_object_t*, const char*, const char*, float);
@@ -242 +244 @@
-void * __vlc_object_create (vlc_object_t *, int);
-int __aout_VolumeInfos (vlc_object_t *, audio_volume_t *);
+void stats_DumpInputStats (input_stats_t *);
-const iso639_lang_t * GetLang_2T (const char *);
-int __intf_Interact (vlc_object_t *,interaction_dialog_t *);
@@ -252 +255 @@
-char * __net_Gets (vlc_object_t *p_this, int fd, v_socket_t *);
-void aout_DateMove (audio_date_t *, mtime_t);
+void stats_ReinitInputStats (input_stats_t *);
-void sout_MuxDelete (sout_mux_t *);
-void vout_InitFormat (video_frame_format_t *, uint32_t, int, int, int);
@@ -874 +878 @@
-    int (*__stats_Create_inner) (vlc_object_t*, char *, int, int);
-    int (*__stats_Update_inner) (vlc_object_t*, char *, vlc_value_t);
+    int (*__stats_Get_inner) (vlc_object_t*, int, char *, vlc_value_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 *);
-};
-#  if defined (__PLUGIN__)
@@ -1296 +1304 @@
-#  define __stats_Create (p_symbols)->__stats_Create_inner
-#  define __stats_Update (p_symbols)->__stats_Update_inner
+#  define __stats_Get (p_symbols)->__stats_Get_inner
+#  define stats_ComputeInputStats (p_symbols)->stats_ComputeInputStats_inner
+#  define stats_DumpInputStats (p_symbols)->stats_DumpInputStats_inner
+#  define stats_ReinitInputStats (p_symbols)->stats_ReinitInputStats_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1721 +1733 @@
-    ((p_symbols)->__stats_Create_inner) = __stats_Create; \
-    ((p_symbols)->__stats_Update_inner) = __stats_Update; \
+    ((p_symbols)->__stats_Get_inner) = __stats_Get; \
+    ((p_symbols)->stats_ComputeInputStats_inner) = stats_ComputeInputStats; \
+    ((p_symbols)->stats_DumpInputStats_inner) = stats_DumpInputStats; \
+    ((p_symbols)->stats_ReinitInputStats_inner) = stats_ReinitInputStats; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-

src/input/input.c

@@ -151 +151 @@
-    p_input->input.i_cr_average = 0;
-
+    stats_ReinitInputStats( p_item->p_stats );
+
-    /* No slave */
-    p_input->i_slave = 0;
@@ -674 +676 @@
-    {
-        stats_Create( p_input, "read_bytes", VLC_VAR_INTEGER, STATS_COUNTER );
+        stats_Create( p_input, "read_packets", VLC_VAR_INTEGER, STATS_COUNTER );
-        stats_Create( p_input, "input_bitrate", VLC_VAR_FLOAT,
-                 
+
-        psz = var_GetString( p_input, "sout" );
-        if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )

src/input/stream.c

@@ -1570 +1570 @@
-    {
-        i_read = p_access->pf_read( p_access, p_read, i_read );
+        stats_UpdateInteger( s->p_parent->p_parent , "read_bytes", i_read );
+        stats_UpdateInteger( s->p_parent->p_parent , "input_bitrate", i_read );
+        stats_UpdateInteger( s->p_parent->p_parent , "read_packets", 1 );
-        return i_read;
-    }
@@ -1598 +1601 @@
-
-    /* Update read bytes in input */
-
-
+
+
+
-    return i_read;
-}

src/misc/stats.c

@@ -28 +28 @@
-
-#include <vlc/vlc.h>
+#include <vlc_input.h>
-
-/*****************************************************************************
@@ -49 +50 @@
-    counter_t *p_counter;
-    stats_handler_t *p_handler = stats_HandlerGet( p_this );
+    if( !p_handler ) return VLC_ENOMEM;
+
+    vlc_mutex_lock( &p_handler->object_lock );
-
-    p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
@@ -64 +68 @@
-                 p_counter );
-
+    vlc_mutex_unlock( &p_handler->object_lock );
+
-    return VLC_SUCCESS;
-}
@@ -71 +77 @@
-int __stats_Update( vlc_object_t *p_this, char *psz_name, vlc_value_t val )
-{
+    int i_ret;
-    counter_t *p_counter;
-
@@ -76 +83 @@
-    stats_handler_t *p_handler = stats_HandlerGet( p_this );
-    if( !p_handler ) return VLC_ENOMEM;
+
+    vlc_mutex_lock( &p_handler->object_lock );
-
-    /* Look for existing element */
@@ -82 +91 @@
-    if( !p_counter )
-    {
+        vlc_mutex_unlock( &p_handler->object_lock );
-        vlc_object_release( p_handler );
-        return VLC_ENOOBJ;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static int stats_CounterUpdate( stats_handler_t *p_handler,
-                                counter_t *p_counter,
@@ -245 +333 @@
-
-
-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/playlist/item.c

@@ -63 +63 @@
-
-    memset( p_item, 0, sizeof( playlist_item_t ) );
+
+    vlc_input_item_Init( p_obj, &p_item->input );
-
-    p_item->input.psz_uri = strdup( psz_uri );

src/playlist/playlist.c

@@ -619 +619 @@
-        if( p_playlist->p_input )
-        {
+            stats_ComputeInputStats( p_playlist->p_input,
+                                  p_playlist->p_input->input.p_item->p_stats );
+
-            /* This input is dead. Remove it ! */
-            if( p_playlist->p_input->b_dead )