* This library provides an interface to the message queue to be used by other
* modules, especially intf modules. See vlc_config.h for output configuration.
*****************************************************************************
- * Copyright (C) 1998-2005 the VideoLAN team
+ * Copyright (C) 1998-2005 VLC authors and VideoLAN
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc_common.h>
-
+#include <stdlib.h>
#include <stdarg.h> /* va_list for BSD */
-
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h> /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
-#endif
-
-#include <errno.h> /* errno */
-
-#ifdef WIN32
-# include <vlc_network.h> /* 'net_strerror' and 'WSAGetLastError' */
-#endif
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* close(), write() */
-#endif
-
+#include <unistd.h>
#include <assert.h>
+#include <vlc_common.h>
+#include <vlc_interface.h>
#include <vlc_charset.h>
+#include <vlc_modules.h>
#include "../libvlc.h"
-/*****************************************************************************
- * Local macros
- *****************************************************************************/
-#if defined(HAVE_VA_COPY)
-# define vlc_va_copy(dest,src) va_copy(dest,src)
-#elif defined(HAVE___VA_COPY)
-# define vlc_va_copy(dest,src) __va_copy(dest,src)
-#else
-# define vlc_va_copy(dest,src) (dest)=(src)
+#ifdef __ANDROID__
+#include <android/log.h>
#endif
-#define QUEUE priv->msg_bank.queue
-#define LOCK_BANK vlc_mutex_lock( &priv->msg_bank.lock );
-#define UNLOCK_BANK vlc_mutex_unlock( &priv->msg_bank.lock );
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void QueueMsg ( vlc_object_t *, int, const char *,
- const char *, va_list );
-static void FlushMsg ( msg_queue_t * );
-static void PrintMsg ( vlc_object_t *, msg_item_t * );
-
-/**
- * Initialize messages queues
- * This function initializes all message queues
- */
-void msg_Create (libvlc_int_t *p_libvlc)
+struct vlc_logger_t
{
- libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- vlc_mutex_init( &priv->msg_bank.lock );
- vlc_mutex_init( &QUEUE.lock );
- QUEUE.b_overflow = false;
- QUEUE.i_start = 0;
- QUEUE.i_stop = 0;
- QUEUE.i_sub = 0;
- QUEUE.pp_sub = 0;
-
-#ifdef UNDER_CE
- QUEUE.logfile =
- CreateFile( L"vlc-log.txt", GENERIC_WRITE,
- FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
- CREATE_ALWAYS, 0, NULL );
- SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
-#endif
-}
-
-/**
- * Flush all message queues
- */
-void msg_Flush (libvlc_int_t *p_libvlc)
+ VLC_COMMON_MEMBERS
+ vlc_rwlock_t lock;
+ vlc_log_cb log;
+ void *sys;
+ module_t *module;
+};
+
+static void vlc_vaLogCallback(libvlc_int_t *vlc, int type,
+ const vlc_log_t *item, const char *format,
+ va_list ap)
{
- libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- vlc_mutex_lock( &QUEUE.lock );
- FlushMsg( &QUEUE );
- vlc_mutex_unlock( &QUEUE.lock );
+ vlc_logger_t *logger = libvlc_priv(vlc)->logger;
+
+ assert(logger != NULL);
+ vlc_rwlock_rdlock(&logger->lock);
+ logger->log(logger->sys, type, item, format, ap);
+ vlc_rwlock_unlock(&logger->lock);
}
-/**
- * Destroy the message queues
- *
- * This functions prints all messages remaining in the queues,
- * then frees all the allocated ressources
- * No other messages interface functions should be called after this one.
- */
-void msg_Destroy (libvlc_int_t *p_libvlc)
+static void vlc_LogCallback(libvlc_int_t *vlc, int type, const vlc_log_t *item,
+ const char *format, ...)
{
- libvlc_priv_t *priv = libvlc_priv (p_libvlc);
-
- if( QUEUE.i_sub )
- msg_Err( p_libvlc, "stale interface subscribers" );
+ va_list ap;
- FlushMsg( &QUEUE );
+ va_start(ap, format);
+ vlc_vaLogCallback(vlc, type, item, format, ap);
+ va_end(ap);
+}
-#ifdef UNDER_CE
- CloseHandle( QUEUE.logfile );
+#ifdef _WIN32
+static void Win32DebugOutputMsg (void *, int , const vlc_log_t *,
+ const char *, va_list);
#endif
- /* Destroy lock */
- vlc_mutex_destroy( &QUEUE.lock );
- vlc_mutex_destroy( &priv->msg_bank.lock);
-}
/**
- * Subscribe to a message queue.
+ * Emit a log message. This function is the variable argument list equivalent
+ * to vlc_Log().
*/
-msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
+void vlc_vaLog (vlc_object_t *obj, int type, const char *module,
+ const char *file, unsigned line, const char *func,
+ const char *format, va_list args)
{
- libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
- msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
+ if (obj != NULL && obj->i_flags & OBJECT_FLAGS_QUIET)
+ return;
- if (p_sub == NULL)
- return NULL;
+ /* Get basename from the module filename */
+ char *p = strrchr(module, '/');
+ if (p != NULL)
+ module = p;
+ p = strchr(module, '.');
- LOCK_BANK;
- vlc_mutex_lock( &QUEUE.lock );
+ size_t modlen = (p != NULL) ? (p - module) : 0;
+ char modulebuf[modlen + 1];
+ if (p != NULL)
+ {
+ memcpy(modulebuf, module, modlen);
+ modulebuf[modlen] = '\0';
+ module = modulebuf;
+ }
- TAB_APPEND( QUEUE.i_sub, QUEUE.pp_sub, p_sub );
+ /* Fill message information fields */
+ vlc_log_t msg;
+
+ msg.i_object_id = (uintptr_t)obj;
+ msg.psz_object_type = (obj != NULL) ? obj->psz_object_type : "generic";
+ msg.psz_module = module;
+ msg.psz_header = NULL;
+ msg.file = file;
+ msg.line = line;
+ msg.func = func;
+
+ for (vlc_object_t *o = obj; o != NULL; o = o->p_parent)
+ if (o->psz_header != NULL)
+ {
+ msg.psz_header = o->psz_header;
+ break;
+ }
- p_sub->i_start = QUEUE.i_start;
- p_sub->pi_stop = &QUEUE.i_stop;
- p_sub->p_msg = QUEUE.msg;
- p_sub->p_lock = &QUEUE.lock;
+#ifdef _WIN32
+ va_list ap;
- vlc_mutex_unlock( &QUEUE.lock );
- UNLOCK_BANK;
+ va_copy (ap, args);
+ Win32DebugOutputMsg (NULL, type, &msg, format, ap);
+ va_end (ap);
+#endif
- return p_sub;
+ /* Pass message to the callback */
+ if (obj != NULL)
+ vlc_vaLogCallback(obj->p_libvlc, type, &msg, format, args);
}
/**
- * Unsubscribe from a message queue.
+ * Emit a log message.
+ * \param obj VLC object emitting the message or NULL
+ * \param type VLC_MSG_* message type (info, error, warning or debug)
+ * \param module name of module from which the message come
+ * (normally MODULE_STRING)
+ * \param file source module file name (normally __FILE__) or NULL
+ * \param line function call source line number (normally __LINE__) or 0
+ * \param func calling function name (normally __func__) or NULL
+ * \param format printf-like message format
*/
-void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
+void vlc_Log(vlc_object_t *obj, int type, const char *module,
+ const char *file, unsigned line, const char *func,
+ const char *format, ... )
{
- libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
-
- LOCK_BANK;
- vlc_mutex_lock( &QUEUE.lock );
- for( int j = 0 ; j< QUEUE.i_sub ; j++ )
- {
- if( QUEUE.pp_sub[j] == p_sub )
- {
- REMOVE_ELEM( QUEUE.pp_sub, QUEUE.i_sub, j );
- free( p_sub );
- }
- }
- vlc_mutex_unlock( &QUEUE.lock );
- UNLOCK_BANK;
-}
-
-/*****************************************************************************
- * __msg_*: print a message
- *****************************************************************************
- * These functions queue a message for later printing.
- *****************************************************************************/
-void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
- const char *psz_format, ... )
-{
- va_list args;
+ va_list ap;
- va_start( args, psz_format );
- QueueMsg( p_this, i_type, psz_module, psz_format, args );
- va_end( args );
+ va_start(ap, format);
+ vlc_vaLog(obj, type, module, file, line, func, format, ap);
+ va_end(ap);
}
-void __msg_GenericVa( vlc_object_t *p_this, int i_type, const char *psz_module,
- const char *psz_format, va_list args )
-{
- QueueMsg( p_this, i_type, psz_module, psz_format, args );
-}
+#ifdef _WIN32
+static const char msg_type[4][9] = { "", " error", " warning", " debug" };
-/* Generic functions used when variadic macros are not available. */
-#define DECLARE_MSG_FN( FN_NAME, FN_TYPE ) \
- void FN_NAME( vlc_object_t *p_this, const char *psz_format, ... ) \
- { \
- va_list args; \
- va_start( args, psz_format ); \
- QueueMsg( p_this, FN_TYPE, "unknown", psz_format, args ); \
- va_end( args ); \
- } \
- struct _
-/**
- * Output an informational message.
- * \note Do not use this for debug messages
- * \see input_AddInfo
- */
-DECLARE_MSG_FN( __msg_Info, VLC_MSG_INFO );
-/**
- * Output an error message.
- */
-DECLARE_MSG_FN( __msg_Err, VLC_MSG_ERR );
-/**
- * Output a waring message
- */
-DECLARE_MSG_FN( __msg_Warn, VLC_MSG_WARN );
-/**
- * Output a debug message
- */
-DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG );
-
-/**
- * Add a message to a queue
- *
- * This function provides basic functionnalities to other msg_* functions.
- * It adds a message to a queue (after having printed all stored messages if it
- * is full). If the message can't be converted to string in memory, it issues
- * a warning.
- */
-static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
- const char *psz_format, va_list _args )
+static void Win32DebugOutputMsg (void* d, int type, const vlc_log_t *p_item,
+ const char *format, va_list dol)
{
- assert (p_this);
- libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
- int i_header_size; /* Size of the additionnal header */
- vlc_object_t *p_obj;
- char * psz_str = NULL; /* formatted message string */
- char * psz_header = NULL;
- va_list args;
- msg_item_t * p_item = NULL; /* pointer to message */
- msg_item_t item; /* message in case of a full queue */
- msg_queue_t *p_queue;
-
-#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
- int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
-#endif
+ VLC_UNUSED(p_item);
- if( p_this->i_flags & OBJECT_FLAGS_QUIET ||
- (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) )
+ const signed char *pverbose = d;
+ if (pverbose && (*pverbose < 0 || *pverbose < (type - VLC_MSG_ERR)))
return;
-#ifndef __GLIBC__
- /* Expand %m to strerror(errno) - only once */
- char buf[strlen( psz_format ) + 2001], *ptr;
- strcpy( buf, psz_format );
- ptr = (char*)buf;
- psz_format = (const char*) buf;
+ va_list dol2;
+ va_copy (dol2, dol);
+ int msg_len = vsnprintf(NULL, 0, format, dol2);
+ va_end (dol2);
- for( ;; )
- {
- ptr = strchr( ptr, '%' );
- if( ptr == NULL )
- break;
+ if(msg_len <= 0)
+ return;
- if( ptr[1] == 'm' )
- {
- char errbuf[2001];
- size_t errlen;
+ char *msg = malloc(msg_len + 1 + 1);
+ if (!msg)
+ return;
-#ifndef WIN32
- strerror_r( errno, errbuf, 1001 );
-#else
- int sockerr = WSAGetLastError( );
- if( sockerr )
- {
- strncpy( errbuf, net_strerror( sockerr ), 1001 );
- WSASetLastError( sockerr );
- }
- if ((sockerr == 0)
- || (strcmp ("Unknown network stack error", errbuf) == 0))
- strncpy( errbuf, strerror( errno ), 1001 );
-#endif
- errbuf[1000] = 0;
-
- /* Escape '%' from the error string */
- for( char *percent = strchr( errbuf, '%' );
- percent != NULL;
- percent = strchr( percent + 2, '%' ) )
- {
- memmove( percent + 1, percent, strlen( percent ) + 1 );
- }
-
- errlen = strlen( errbuf );
- memmove( ptr + errlen, ptr + 2, strlen( ptr + 2 ) + 1 );
- memcpy( ptr, errbuf, errlen );
- break; /* Only once, so we don't overflow */
+ msg_len = vsnprintf(msg, msg_len+1, format, dol);
+ if (msg_len > 0){
+ if(msg[msg_len-1] != '\n'){
+ msg[msg_len] = '\n';
+ msg[msg_len + 1] = '\0';
+ }
+ char* psz_msg = NULL;
+ if(asprintf(&psz_msg, "%s %s%s: %s", p_item->psz_module,
+ p_item->psz_object_type, msg_type[type], msg) > 0) {
+ wchar_t* wmsg = ToWide(psz_msg);
+ OutputDebugStringW(wmsg);
+ free(wmsg);
+ free(psz_msg);
}
-
- /* Looks for conversion specifier... */
- do
- ptr++;
- while( *ptr && ( strchr( "diouxXeEfFgGaAcspn%", *ptr ) == NULL ) );
- if( *ptr )
- ptr++; /* ...and skip it */
}
+ free(msg);
+}
#endif
- /* Convert message to string */
-#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS )
- vlc_va_copy( args, _args );
- if( vasprintf( &psz_str, psz_format, args ) == -1 )
- psz_str = NULL;
- va_end( args );
-#else
- psz_str = (char*) malloc( i_size );
-#endif
+#ifdef __ANDROID__
+static void AndroidPrintMsg (void *d, int type, const vlc_log_t *p_item,
+ const char *format, va_list ap)
+{
+ int verbose = (intptr_t)d;
+ int prio;
- if( psz_str == NULL )
- {
- int canc = vlc_savecancel (); /* Do not print half of a message... */
-#ifdef __GLIBC__
- fprintf( stderr, "main warning: can't store message (%m): " );
-#else
- char psz_err[1001];
-#ifndef WIN32
- /* we're not using GLIBC, so we are sure that the error description
- * will be stored in the buffer we provide to strerror_r() */
- strerror_r( errno, psz_err, 1001 );
-#else
- strncpy( psz_err, strerror( errno ), 1001 );
-#endif
- psz_err[1000] = '\0';
- fprintf( stderr, "main warning: can't store message (%s): ", psz_err );
-#endif
- vlc_va_copy( args, _args );
- /* We should use utf8_vfprintf - but it calls malloc()... */
- vfprintf( stderr, psz_format, args );
- va_end( args );
- fputs( "\n", stderr );
- vlc_restorecancel (canc);
+ if (verbose < 0 || verbose < (type - VLC_MSG_ERR))
return;
- }
- i_header_size = 0;
- p_obj = p_this;
- while( p_obj != NULL )
- {
- char *psz_old = NULL;
- if( p_obj->psz_header )
- {
- i_header_size += strlen( p_obj->psz_header ) + 4;
- if( psz_header )
- {
- psz_old = strdup( psz_header );
- psz_header = (char*)realloc( psz_header, i_header_size );
- snprintf( psz_header, i_header_size , "[%s] %s",
- p_obj->psz_header, psz_old );
- }
- else
- {
- psz_header = (char *)malloc( i_header_size );
- snprintf( psz_header, i_header_size, "[%s]",
- p_obj->psz_header );
- }
- }
- free( psz_old );
- p_obj = p_obj->p_parent;
- }
+ int canc = vlc_savecancel ();
-#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
- vlc_va_copy( args, _args );
- vsnprintf( psz_str, i_size, psz_format, args );
- va_end( args );
- psz_str[ i_size - 1 ] = 0; /* Just in case */
+ char *format2;
+ if (asprintf (&format2, "[%0*"PRIxPTR"] %s %s: %s",
+ ptr_width, p_item->i_object_id, p_item->psz_module,
+ p_item->psz_object_type, format) < 0)
+ return;
+ switch (type) {
+ case VLC_MSG_INFO:
+ prio = ANDROID_LOG_INFO;
+ break;
+ case VLC_MSG_ERR:
+ prio = ANDROID_LOG_ERROR;
+ break;
+ case VLC_MSG_WARN:
+ prio = ANDROID_LOG_WARN;
+ break;
+ default:
+ case VLC_MSG_DBG:
+ prio = ANDROID_LOG_DEBUG;
+ }
+ __android_log_vprint (prio, "VLC", format2, ap);
+ free (format2);
+ vlc_restorecancel (canc);
+}
#endif
- LOCK_BANK;
- p_queue = &QUEUE;
- vlc_mutex_lock( &p_queue->lock );
+typedef struct vlc_log_early_t
+{
+ struct vlc_log_early_t *next;
+ int type;
+ vlc_log_t meta;
+ char *msg;
+} vlc_log_early_t;
- /* Check there is room in the queue for our message */
- if( p_queue->b_overflow )
- {
- FlushMsg( p_queue );
+typedef struct
+{
+ vlc_mutex_t lock;
+ vlc_log_early_t *head;
+ vlc_log_early_t **tailp;
+} vlc_logger_early_t;
- if( ((p_queue->i_stop - p_queue->i_start + 1) % VLC_MSG_QSIZE) == 0 )
- {
- /* Still in overflow mode, print from a dummy item */
- p_item = &item;
- }
- else
- {
- /* Pheeew, at last, there is room in the queue! */
- p_queue->b_overflow = false;
- }
- }
- else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 )
- {
- FlushMsg( p_queue );
+static void vlc_vaLogEarly(void *d, int type, const vlc_log_t *item,
+ const char *format, va_list ap)
+{
+ vlc_logger_early_t *sys = d;
- if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 )
- {
- p_queue->b_overflow = true;
-
- /* Put the overflow message in the queue */
- p_item = p_queue->msg + p_queue->i_stop;
- p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE;
-
- p_item->i_type = VLC_MSG_WARN;
- p_item->i_object_id = p_this->i_object_id;
- p_item->psz_object_type = p_this->psz_object_type;
- p_item->psz_module = strdup( "message" );
- p_item->psz_msg = strdup( "message queue overflowed" );
- p_item->psz_header = NULL;
-
- PrintMsg( p_this, p_item );
- /* We print from a dummy item */
- p_item = &item;
- }
- }
+ vlc_log_early_t *log = malloc(sizeof (*log));
+ if (unlikely(log == NULL))
+ return;
- if( !p_queue->b_overflow )
- {
- /* Put the message in the queue */
- p_item = p_queue->msg + p_queue->i_stop;
- p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE;
- }
+ log->next = NULL;
+ log->type = type;
+ log->meta.i_object_id = item->i_object_id;
+ /* NOTE: Object types MUST be static constant - no need to copy them. */
+ log->meta.psz_object_type = item->psz_object_type;
+ log->meta.psz_module = item->psz_module; /* Ditto. */
+ log->meta.psz_header = item->psz_header ? strdup(item->psz_header) : NULL;
+ log->meta.file = item->file;
+ log->meta.line = item->line;
+ log->meta.func = item->func;
+
+ int canc = vlc_savecancel(); /* XXX: needed for vasprintf() ? */
+ if (vasprintf(&log->msg, format, ap) == -1)
+ log->msg = NULL;
+ vlc_restorecancel(canc);
+
+ vlc_mutex_lock(&sys->lock);
+ assert(sys->tailp != NULL);
+ assert(*(sys->tailp) == NULL);
+ *(sys->tailp) = log;
+ sys->tailp = &log->next;
+ vlc_mutex_unlock(&sys->lock);
+}
- /* Fill message information fields */
- p_item->i_type = i_type;
- p_item->i_object_id = p_this->i_object_id;
- p_item->psz_object_type = p_this->psz_object_type;
- p_item->psz_module = strdup( psz_module );
- p_item->psz_msg = psz_str;
- p_item->psz_header = psz_header;
+static int vlc_LogEarlyOpen(vlc_logger_t *logger)
+{
+ vlc_logger_early_t *sys = malloc(sizeof (*sys));
+
+ if (unlikely(sys == NULL))
+ return -1;
- PrintMsg( p_this, p_item );
+ vlc_mutex_init(&sys->lock);
+ sys->head = NULL;
+ sys->tailp = &sys->head;
- if( p_queue->b_overflow )
+ logger->log = vlc_vaLogEarly;
+ logger->sys = sys;
+ return 0;
+}
+
+static void vlc_LogEarlyClose(vlc_logger_t *logger, void *d)
+{
+ libvlc_int_t *vlc = logger->p_libvlc;
+ vlc_logger_early_t *sys = d;
+
+ /* Drain early log messages */
+ for (vlc_log_early_t *log = sys->head, *next; log != NULL; log = next)
{
- free( p_item->psz_module );
- free( p_item->psz_msg );
- free( p_item->psz_header );
+ vlc_LogCallback(vlc, log->type, &log->meta, "%s",
+ (log->msg != NULL) ? log->msg : "message lost");
+ free(log->msg);
+ next = log->next;
+ free(log);
}
- vlc_mutex_unlock ( &p_queue->lock );
- UNLOCK_BANK;
+ vlc_mutex_destroy(&sys->lock);
+ free(sys);
}
-/* following functions are local */
-
-/*****************************************************************************
- * FlushMsg
- *****************************************************************************
- * Print all messages remaining in queue. MESSAGE QUEUE MUST BE LOCKED, since
- * this function does not check the lock.
- *****************************************************************************/
-static void FlushMsg ( msg_queue_t *p_queue )
+static void vlc_vaLogDiscard(void *d, int type, const vlc_log_t *item,
+ const char *format, va_list ap)
{
- int i_index, i_start, i_stop;
+ (void) d; (void) type; (void) item; (void) format; (void) ap;
+}
- /* Get the maximum message index that can be freed */
- i_stop = p_queue->i_stop;
+static int vlc_logger_load(void *func, va_list ap)
+{
+ vlc_log_cb (*activate)(vlc_object_t *, void **) = func;
+ vlc_logger_t *logger = va_arg(ap, vlc_logger_t *);
+ vlc_log_cb *cb = va_arg(ap, vlc_log_cb *);
+ void **sys = va_arg(ap, void **);
- /* Check until which value we can free messages */
- for( i_index = 0; i_index < p_queue->i_sub; i_index++ )
- {
- i_start = p_queue->pp_sub[ i_index ]->i_start;
-
- /* If this subscriber is late, we don't free messages before
- * his i_start value, otherwise he'll miss messages */
- if( ( i_start < i_stop
- && (p_queue->i_stop <= i_start || i_stop <= p_queue->i_stop) )
- || ( i_stop < i_start
- && (i_stop <= p_queue->i_stop && p_queue->i_stop <= i_start) ) )
- {
- i_stop = i_start;
- }
- }
+ *cb = activate(VLC_OBJECT(logger), sys);
+ return (*cb != NULL) ? VLC_SUCCESS : VLC_EGENERIC;
+}
- /* Free message data */
- for( i_index = p_queue->i_start;
- i_index != i_stop;
- i_index = (i_index+1) % VLC_MSG_QSIZE )
- {
- free( p_queue->msg[i_index].psz_msg );
- free( p_queue->msg[i_index].psz_module );
- free( p_queue->msg[i_index].psz_header );
- }
+static void vlc_logger_unload(void *func, va_list ap)
+{
+ void (*deactivate)(vlc_logger_t *) = func;
+ void *sys = va_arg(ap, void *);
- /* Update the new start value */
- p_queue->i_start = i_index;
+ deactivate(sys);
}
-/*****************************************************************************
- * PrintMsg: output a standard message item to stderr
- *****************************************************************************
- * Print a message to stderr, with colour formatting if needed.
- *****************************************************************************/
-static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
+/**
+ * Performs preinitialization of the messages logging subsystem.
+ *
+ * Early log messages will be stored in memory until the subsystem is fully
+ * initialized with vlc_LogInit(). This enables logging before the
+ * configuration and modules bank are ready.
+ *
+ * \return 0 on success, -1 on error.
+ */
+int vlc_LogPreinit(libvlc_int_t *vlc)
{
-# define COL(x) "\033[" #x ";1m"
-# define RED COL(31)
-# define GREEN COL(32)
-# define YELLOW COL(33)
-# define WHITE COL(0)
-# define GRAY "\033[0m"
-
-#ifdef UNDER_CE
- int i_dummy;
-#endif
- static const char ppsz_type[4][9] = { "", " error", " warning", " debug" };
- static const char ppsz_color[4][8] = { WHITE, RED, YELLOW, GRAY };
- const char *psz_object;
- libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
- int i_type = p_item->i_type;
+ vlc_logger_t *logger = vlc_custom_create(vlc, sizeof (*logger), "logger");
- switch( i_type )
- {
- case VLC_MSG_ERR:
- if( priv->i_verbose < 0 ) return;
- break;
- case VLC_MSG_INFO:
- if( priv->i_verbose < 0 ) return;
- break;
- case VLC_MSG_WARN:
- if( priv->i_verbose < 1 ) return;
- break;
- case VLC_MSG_DBG:
- if( priv->i_verbose < 2 ) return;
- break;
- }
+ libvlc_priv(vlc)->logger = logger;
- psz_object = p_item->psz_object_type;
+ if (unlikely(logger == NULL))
+ return -1;
- int canc = vlc_savecancel ();
-#ifdef UNDER_CE
-# define CE_WRITE(str) WriteFile( QUEUE.logfile, \
- str, strlen(str), &i_dummy, NULL );
- CE_WRITE( p_item->psz_module );
- CE_WRITE( " " );
- CE_WRITE( psz_object );
- CE_WRITE( ppsz_type[i_type] );
- CE_WRITE( ": " );
- CE_WRITE( p_item->psz_msg );
- CE_WRITE( "\r\n" );
- FlushFileBuffers( QUEUE.logfile );
+ vlc_rwlock_init(&logger->lock);
-#else
- /* Send the message to stderr */
- if( priv->b_color )
+ if (vlc_LogEarlyOpen(logger))
{
- if( p_item->psz_header )
- {
- utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s %s%s: %s%s" GRAY
- "\n",
- p_item->i_object_id, p_item->psz_header,
- p_item->psz_module, psz_object,
- ppsz_type[i_type], ppsz_color[i_type],
- p_item->psz_msg );
- }
- else
- {
- utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s%s: %s%s" GRAY "\n",
- p_item->i_object_id, p_item->psz_module, psz_object,
- ppsz_type[i_type], ppsz_color[i_type],
- p_item->psz_msg );
- }
- }
- else
- {
- if( p_item->psz_header )
- {
- utf8_fprintf( stderr, "[%.8i] %s %s %s%s: %s\n", p_item->i_object_id,
- p_item->psz_header, p_item->psz_module,
- psz_object, ppsz_type[i_type], p_item->psz_msg );
- }
- else
- {
- utf8_fprintf( stderr, "[%.8i] %s %s%s: %s\n", p_item->i_object_id,
- p_item->psz_module, psz_object, ppsz_type[i_type],
- p_item->psz_msg );
- }
+ logger->log = vlc_vaLogDiscard;
+ return -1;
}
-# if defined(WIN32)
- fflush( stderr );
-# endif
- vlc_restorecancel (canc);
-#endif
+ /* Announce who we are */
+ msg_Dbg(vlc, "VLC media player - %s", VERSION_MESSAGE);
+ msg_Dbg(vlc, "%s", COPYRIGHT_MESSAGE);
+ msg_Dbg(vlc, "revision %s", psz_vlc_changeset);
+ msg_Dbg(vlc, "configured with %s", CONFIGURE_LINE);
+ return 0;
}
-static msg_context_t* GetContext(void)
+/**
+ * Initializes the messages logging subsystem and drain the early messages to
+ * the configured log.
+ *
+ * \return 0 on success, -1 on error.
+ */
+int vlc_LogInit(libvlc_int_t *vlc)
{
- msg_context_t *p_ctx = vlc_threadvar_get( &msg_context_global_key );
- if( p_ctx == NULL )
- {
- MALLOC_NULL( p_ctx, msg_context_t );
- p_ctx->psz_message = NULL;
- vlc_threadvar_set( &msg_context_global_key, p_ctx );
- }
- return p_ctx;
-}
+ vlc_logger_t *logger = libvlc_priv(vlc)->logger;
+ if (unlikely(logger == NULL))
+ return -1;
+
+ vlc_log_cb cb;
+ void *sys, *early_sys = NULL;
+
+ /* TODO: module configuration item */
+ module_t *module = vlc_module_load(logger, "logger", NULL, false,
+ vlc_logger_load, logger, &cb, &sys);
+ if (module == NULL)
+#ifdef __ANDROID__
+ cb = AndroidPrintMsg, sys = NULL;
+#else
+ cb = vlc_vaLogDiscard;
+#endif
-void msg_StackDestroy (void *data)
-{
- msg_context_t *p_ctx = data;
+ vlc_rwlock_wrlock(&logger->lock);
+ if (logger->log == vlc_vaLogEarly)
+ early_sys = logger->sys;
+
+ logger->log = cb;
+ logger->sys = sys;
+ assert(logger->module == NULL); /* Only one call to vlc_LogInit()! */
+ logger->module = module;
+ vlc_rwlock_unlock(&logger->lock);
+
+ if (early_sys != NULL)
+ vlc_LogEarlyClose(logger, early_sys);
- free (p_ctx->psz_message);
- free (p_ctx);
+ return 0;
}
-void msg_StackSet( int i_code, const char *psz_message, ... )
+/**
+ * Sets the message logging callback.
+ * \param cb message callback, or NULL to clear
+ * \param data data pointer for the message callback
+ */
+void vlc_LogSet(libvlc_int_t *vlc, vlc_log_cb cb, void *opaque)
{
- va_list ap;
- msg_context_t *p_ctx = GetContext();
+ vlc_logger_t *logger = libvlc_priv(vlc)->logger;
- if( p_ctx == NULL )
+ if (unlikely(logger == NULL))
return;
- free( p_ctx->psz_message );
- va_start( ap, psz_message );
- if( vasprintf( &p_ctx->psz_message, psz_message, ap ) == -1 )
- p_ctx->psz_message = NULL;
- va_end( ap );
+ module_t *module;
+ void *sys;
+
+ if (cb == NULL)
+ cb = vlc_vaLogDiscard;
+
+ vlc_rwlock_wrlock(&logger->lock);
+ sys = logger->sys;
+ module = logger->module;
+
+ logger->log = cb;
+ logger->sys = opaque;
+ logger->module = NULL;
+ vlc_rwlock_unlock(&logger->lock);
- p_ctx->i_code = i_code;
+ if (module != NULL)
+ vlc_module_unload(module, vlc_logger_unload, sys);
+
+ /* Announce who we are */
+ msg_Dbg (vlc, "VLC media player - %s", VERSION_MESSAGE);
+ msg_Dbg (vlc, "%s", COPYRIGHT_MESSAGE);
+ msg_Dbg (vlc, "revision %s", psz_vlc_changeset);
+ msg_Dbg (vlc, "configured with %s", CONFIGURE_LINE);
}
-void msg_StackAdd( const char *psz_message, ... )
+void vlc_LogDeinit(libvlc_int_t *vlc)
{
- char *psz_tmp;
- va_list ap;
- msg_context_t *p_ctx = GetContext();
+ vlc_logger_t *logger = libvlc_priv(vlc)->logger;
- if( p_ctx == NULL )
+ if (unlikely(logger == NULL))
return;
- va_start( ap, psz_message );
- if( vasprintf( &psz_tmp, psz_message, ap ) == -1 )
- psz_tmp = NULL;
- va_end( ap );
-
- if( !p_ctx->psz_message )
- p_ctx->psz_message = psz_tmp;
+ if (logger->module != NULL)
+ vlc_module_unload(logger->module, vlc_logger_unload, logger->sys);
else
+ /* Flush early log messages (corner case: no call to vlc_LogInit()) */
+ if (logger->log == vlc_vaLogEarly)
{
- char *psz_new;
- if( asprintf( &psz_new, "%s: %s", psz_tmp, p_ctx->psz_message ) == -1 )
- psz_new = NULL;
-
- free( p_ctx->psz_message );
- p_ctx->psz_message = psz_new;
- free( psz_tmp );
+ logger->log = vlc_vaLogDiscard;
+ vlc_LogEarlyClose(logger, logger->sys);
}
-}
-const char* msg_StackMsg( void )
-{
- msg_context_t *p_ctx = GetContext();
- assert( p_ctx );
- return p_ctx->psz_message;
+ vlc_rwlock_destroy(&logger->lock);
+ vlc_object_release(logger);
+ libvlc_priv(vlc)->logger = NULL;
}
projects / vlc / blobdiff