X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flogger.c;h=d454a074fdcd61f6497b26686a4c9776401c2a82;hb=5e15258c9ef28558fe2abc941fc1527e02b04c21;hp=eb06269595148c5cc67f556cdd073170c3d25603;hpb=59dec65d5fe153565ea8705767874a2d876d2103;p=vlc diff --git a/modules/misc/logger.c b/modules/misc/logger.c index eb06269595..d454a074fd 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -86,6 +86,7 @@ struct intf_sys_t int i_mode; FILE *p_rrd; mtime_t last_update; + time_t now; /* timestamp for rrd-log */ FILE * p_file; /* The log file */ msg_subscription_t *p_sub; @@ -110,12 +111,12 @@ static void DoRRD( intf_thread_t *p_intf ); /***************************************************************************** * Module descriptor *****************************************************************************/ -static const char *mode_list[] = { "text", "html" +static const char *const mode_list[] = { "text", "html" #ifdef HAVE_SYSLOG_H ,"syslog" #endif }; -static const char *mode_list_text[] = { N_("Text"), "HTML" +static const char *const mode_list_text[] = { N_("Text"), "HTML" #ifdef HAVE_SYSLOG_H , "syslog" #endif @@ -442,6 +443,7 @@ static void DoRRD( intf_thread_t *p_intf ) if( p_intf->p_libvlc->p_stats ) { + time(&p_intf->p_sys->now); lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000, 1000 ); lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000, @@ -450,7 +452,7 @@ static void DoRRD( intf_thread_t *p_intf ) 1000 ); fprintf( p_intf->p_sys->p_rrd, "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n", - p_intf->p_sys->last_update/1000000, + (uintmax_t)p_intf->p_sys->now, din.quot, (unsigned int)din.rem, ddm.quot, (unsigned int)ddm.rem, dout.quot, (unsigned int)dout.rem );