Changeset 226344134ee28d50d5e29d19f5b7ffe4b4df40fd

Timestamp:

28/01/06 11:56:47 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[1ab90751c095b208a87e37d4d0fdbd765f0f4923]

git-author:

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

Message:

RRD output (Refs:#473)
This is a quick hack, which should in the end be merged in a way to expose stats

Files:

• doc/rrd-howto.txt (added)
• modules/misc/logger.c (modified) (7 diffs)

modules/misc/logger.c

@@ -78 +78 @@
-{
-    int i_mode;
+    FILE *p_rrd;
+    mtime_t last_update;
-
-    FILE *    p_file; /* The log file */
@@ -96 +98 @@
-static void SyslogPrint       ( const msg_item_t *);
-#endif
+
+static void DoRRD( intf_thread_t *p_intf );
-
-/*****************************************************************************
@@ -128 +132 @@
-        change_string_list( mode_list, mode_list_text, 0 );
-
+    add_string( "rrd-file", NULL, NULL, N_("RRD output file") ,
+                    N_("Output data for RRDTool in this file" ), VLC_TRUE );
+
-    set_capability( "interface", 0 );
-    set_callbacks( Open, Close );
@@ -138 +145 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
-
+, *psz_rrd_file
-
-    CONSOLE_INTRO_MSG;
@@ -262 +269 @@
-    }
-
+    p_intf->p_sys->last_update = 0;
+    p_intf->p_sys->p_rrd = NULL;
+
+    psz_rrd_file = config_GetPsz( p_intf, "rrd-file" );
+    if( psz_rrd_file && *psz_rrd_file )
+    {
+        p_intf->p_sys->p_rrd = fopen( psz_rrd_file, "w" );
+    }
+
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf , MSG_QUEUE_NORMAL );
-    p_intf->pf_run = Run;
@@ -316 +332 @@
-        FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
-                    p_intf->p_sys->i_mode );
+
+        if( p_intf->p_sys->p_rrd )
+            DoRRD( p_intf );
-
-        msleep( INTF_IDLE_SLEEP );
@@ -401 +420 @@
-}
-
+static void DoRRD( intf_thread_t *p_intf )
+{
+    playlist_t *p_playlist;
+    float f_input_bitrate;
+    if( mdate() - p_intf->p_sys->last_update < 1000000 )
+        return;
+    p_intf->p_sys->last_update = mdate();
+
+    p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                                FIND_ANYWHERE );
+    if( p_playlist && p_playlist->p_stats )
+    {
+        fprintf( p_intf->p_sys->p_rrd, I64Fi":%f:%f:%f\n",
+                   p_intf->p_sys->last_update/1000000,
+                   (float)(p_playlist->p_stats->f_input_bitrate)*1000,
+                   (float)(p_playlist->p_stats->f_demux_bitrate)*1000,
+                   (float)(p_playlist->p_stats->f_output_bitrate)*1000 );
+        fflush( p_intf->p_sys->p_rrd );
+        vlc_object_release( p_playlist );
+    }
+}