# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_charset.h>
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;
static void Close ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static void FlushQueue ( msg_subscription_t *, FILE *, int );
+static void FlushQueue ( msg_subscription_t *, FILE *, int, int );
static void TextPrint ( const msg_item_t *, FILE * );
static void HtmlPrint ( const msg_item_t *, FILE * );
#ifdef HAVE_SYSLOG_H
/*****************************************************************************
* 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
#endif
vlc_module_begin();
- set_shortname( _( "Logging" ) );
- set_description( _("File logging") );
+ set_shortname( N_( "Logging" ) );
+ set_description( N_("File logging") );
set_category( CAT_ADVANCED );
set_subcategory( SUBCAT_ADVANCED_MISC );
add_file( "logfile", NULL, NULL,
- N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
+ N_("Log filename"), N_("Specify the log filename."), false );
change_unsafe();
add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
- VLC_FALSE );
+ false );
change_string_list( mode_list, mode_list_text, 0 );
add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
- N_("Output data for RRDTool in this file." ), VLC_TRUE );
+ N_("Output data for RRDTool in this file." ), true );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
- {
- msg_Err( p_intf, "out of memory" );
return -1;
- }
psz_mode = var_CreateGetString( p_intf, "logmode" );
if( psz_mode )
if( !psz_file )
{
#ifdef __APPLE__
- char *psz_homedir = p_this->p_libvlc->psz_homedir;
-
- if( !psz_homedir ) /* XXX: This should never happen */
- {
- msg_Err( p_this, "unable to find home directory" );
- return -1;
- }
- psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
- strlen(psz_homedir) );
- if( psz_file )
- {
- switch( p_intf->p_sys->i_mode )
- {
- case MODE_HTML:
- sprintf( psz_file, "%s/" LOG_DIR "/" LOG_FILE_HTML,
- psz_homedir );
- break;
- case MODE_TEXT:
- default:
- sprintf( psz_file, "%s/" LOG_DIR "/" LOG_FILE_TEXT,
- psz_homedir );
- break;
- }
- }
+ if( asprintf( &psz_file, "%s/"LOG_DIR"/%s", config_GetHomeDir(),
+ (p_intf->p_sys->i_mode == MODE_HTML) ? LOG_FILE_HTML
+ : LOG_FILE_TEXT ) == -1 )
+ psz_file = NULL;
#else
switch( p_intf->p_sys->i_mode )
{
{
p_intf->p_sys->p_file = NULL;
#ifdef HAVE_SYSLOG_H
- openlog( "VLC", 0, LOG_DAEMON );
+ openlog( "vlc", LOG_PID|LOG_NDELAY, LOG_DAEMON );
#endif
}
{
p_intf->p_sys->p_rrd = utf8_fopen( psz_rrd_file, "w" );
}
+ free( psz_rrd_file );
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf , MSG_QUEUE_NORMAL );
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
p_intf->pf_run = Run;
return 0;
/* Flush the queue and unsubscribe from the message queue */
FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
- p_intf->p_sys->i_mode );
+ p_intf->p_sys->i_mode,
+ var_CreateGetInteger( p_intf, "verbose" ) );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
switch( p_intf->p_sys->i_mode )
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- while( !p_intf->b_die )
+ while( vlc_object_alive (p_intf) )
{
FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
- p_intf->p_sys->i_mode );
-
+ p_intf->p_sys->i_mode,
+ var_CreateGetInteger( p_intf, "verbose" ) );
if( p_intf->p_sys->p_rrd )
DoRRD( p_intf );
/*****************************************************************************
* FlushQueue: flush the message queue into the log
*****************************************************************************/
-static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode )
+static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode,
+ int i_verbose )
{
int i_start, i_stop;
i_start != i_stop;
i_start = (i_start+1) % VLC_MSG_QSIZE )
{
+ switch( p_sub->p_msg[i_start].i_type )
+ {
+ case VLC_MSG_ERR:
+ if( i_verbose < 0 ) continue;
+ break;
+ case VLC_MSG_INFO:
+ if( i_verbose < 0 ) continue;
+ break;
+ case VLC_MSG_WARN:
+ if( i_verbose < 1 ) continue;
+ break;
+ case VLC_MSG_DBG:
+ if( i_verbose < 2 ) continue;
+ break;
+ }
+
switch( i_mode )
{
case MODE_HTML:
#ifdef HAVE_SYSLOG_H
static void SyslogPrint( const msg_item_t *p_msg )
{
- int i_priority = LOG_INFO;
-
- if( p_msg->i_type == 0 ) i_priority = LOG_INFO;
- if( p_msg->i_type == 1 ) i_priority = LOG_ERR;
- if( p_msg->i_type == 2 ) i_priority = LOG_WARNING;
- if( p_msg->i_type == 3 ) i_priority = LOG_DEBUG;
+ static const int i_prio[4] = { LOG_INFO, LOG_ERR, LOG_WARNING, LOG_DEBUG };
+ int i_priority = i_prio[p_msg->i_type];
if( p_msg->psz_header )
- syslog( i_priority, "%s %s: %s", p_msg->psz_header,
+ syslog( i_priority, "%s%s %s: %s", p_msg->psz_header,
+ ppsz_type[p_msg->i_type],
p_msg->psz_module, p_msg->psz_msg );
else
- syslog( i_priority, "%s: %s", p_msg->psz_module, p_msg->psz_msg );
+ syslog( i_priority, "%s%s: %s", p_msg->psz_module,
+ ppsz_type[p_msg->i_type], p_msg->psz_msg );
}
#endif
static void DoRRD( intf_thread_t *p_intf )
{
- playlist_t *p_playlist;
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 )
+ if( p_intf->p_libvlc->p_stats )
{
- lldiv_t din = lldiv( p_playlist->p_stats->f_input_bitrate * 1000000,
+ 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_playlist->p_stats->f_demux_bitrate * 1000000,
+ lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
1000 );
- lldiv_t dout = lldiv( p_playlist->p_stats->f_output_bitrate * 1000000,
+ lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000,
1000 );
fprintf( p_intf->p_sys->p_rrd,
- I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n",
- p_intf->p_sys->last_update/1000000,
+ "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n",
+ (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 );
fflush( p_intf->p_sys->p_rrd );
- vlc_object_release( p_playlist );
}
}
projects / vlc / blobdiff