*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#include <vlc/vlc.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
#include <errno.h> /* ENOMEM */
-#include <stdio.h>
#ifdef UNDER_CE
# define _IONBF 0x0004
#endif
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
#define MODE_TEXT 0
#define MODE_HTML 1
#define MODE_SYSLOG 2
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
#define LOG_DIR "Library/Logs/"
#endif
struct intf_sys_t
{
int i_mode;
+ FILE *p_rrd;
+ mtime_t last_update;
FILE * p_file; /* The log file */
msg_subscription_t *p_sub;
static void SyslogPrint ( const msg_item_t *);
#endif
+static void DoRRD( intf_thread_t *p_intf );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *mode_list[] = { "text", "html"
+static const char *mode_list[] = { "text", "html"
#ifdef HAVE_SYSLOG_H
,"syslog"
#endif
};
-static char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *mode_list_text[] = { N_("Text"), "HTML"
#ifdef HAVE_SYSLOG_H
, "syslog"
#endif
#define LOGMODE_TEXT N_("Log format")
#ifdef HAVE_SYSLOG_H
-#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default), \"html\", and \"syslog\".")
+#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
+ "\"text\" (default), \"html\", and \"syslog\" (special mode to send to " \
+ "syslog instead of file.")
#else
-#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default) and \"html\".")
+#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
+ "\"text\" (default) and \"html\".")
#endif
vlc_module_begin();
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_shortname( N_( "Logging" ) );
+ set_shortname( _( "Logging" ) );
set_description( _("File logging") );
- add_file( "logfile", NULL, NULL, N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
+ set_category( CAT_ADVANCED );
+ set_subcategory( SUBCAT_ADVANCED_MISC );
+
+ add_file( "logfile", NULL, NULL,
+ N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
VLC_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 );
+
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- char *psz_mode, *psz_file;
+ char *psz_mode, *psz_file, *psz_rrd_file;
CONSOLE_INTRO_MSG;
- msg_Info( p_intf, "Using logger..." );
+ msg_Info( p_intf, "using logger..." );
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
return -1;
}
- psz_mode = config_GetPsz( p_intf, "logmode" );
+ psz_mode = var_CreateGetString( p_intf, "logmode" );
if( psz_mode )
{
if( !strcmp( psz_mode, "text" ) )
#endif
else
{
- msg_Err( p_intf, "invalid log mode `%s', using `text'", psz_mode );
+ msg_Warn( p_intf, "invalid log mode `%s', using `text'", psz_mode );
p_intf->p_sys->i_mode = MODE_TEXT;
}
psz_file = config_GetPsz( p_intf, "logfile" );
if( !psz_file )
{
-#ifdef SYS_DARWIN
- char *psz_homedir = p_this->p_vlc->psz_homedir;
+#ifdef __APPLE__
+ char *psz_homedir = p_this->p_libvlc->psz_homedir;
- if( !psz_homedir )
+ if( !psz_homedir ) /* XXX: This should never happen */
{
- msg_Err( p_this, "psz_homedir is null" );
+ msg_Err( p_this, "unable to find home directory" );
return -1;
}
psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
/* Open the log file and remove any buffering for the stream */
msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
- p_intf->p_sys->p_file = fopen( psz_file, "wt" );
+ p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
if( p_intf->p_sys->p_file == NULL )
{
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
#endif
}
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ 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 = utf8_fopen( psz_rrd_file, "w" );
+ }
+
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf , MSG_QUEUE_NORMAL );
p_intf->pf_run = Run;
return 0;
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 );
}
}
if( p_msg->i_type == 2 ) i_priority = LOG_WARNING;
if( p_msg->i_type == 3 ) i_priority = LOG_DEBUG;
- syslog( i_priority, "%s %s", p_msg->psz_module, p_msg->psz_msg );
+ if( p_msg->psz_header )
+ syslog( i_priority, "%s %s: %s", p_msg->psz_header,
+ p_msg->psz_module, p_msg->psz_msg );
+ else
+ syslog( i_priority, "%s: %s", p_msg->psz_module, p_msg->psz_msg );
+
}
#endif
LOG_STRING( "</font>\n", p_file );
}
+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 )
+ {
+ lldiv_t din = lldiv( p_playlist->p_stats->f_input_bitrate * 1000000,
+ 1000 );
+ lldiv_t ddm = lldiv( p_playlist->p_stats->f_demux_bitrate * 1000000,
+ 1000 );
+ lldiv_t dout = lldiv( p_playlist->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,
+ 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