X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=6eeed09c8b81e5d166c9deb244f48f0cd9ef0e09;hb=e5c071abd8c79d19f3f6e19f626540e241c36849;hp=b202366b2fcf8aea910b98b0a7c3c67c7befb1bc;hpb=b69c9ce1279a154a8bbbe35b16a7bc7480cd967b;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index b202366b2f..6eeed09c8b 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -1,10 +1,10 @@ /***************************************************************************** * messages.c: messages interface * This library provides an interface to the message queue to be used by other - * modules, especially intf modules. See config.h for output configuration. + * modules, especially intf modules. See vlc_config.h for output configuration. ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: messages.c,v 1.10 2002/08/26 09:12:46 sam Exp $ + * Copyright (C) 1998-2005 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -13,7 +13,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 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 @@ -21,190 +21,205 @@ * * 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 /* errno */ -#include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ + +#include + #include /* required */ #include /* va_list for BSD */ #include /* malloc() */ #include /* strerror() */ -#include +#ifdef HAVE_FCNTL_H +# include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ +#endif + +#include /* errno */ #ifdef HAVE_UNISTD_H -#include /* close(), write() */ +# include /* close(), write() */ #endif -#include "interface.h" +#include + +#include /***************************************************************************** - * Local prototypes + * Local macros *****************************************************************************/ -static void QueueMsg ( vlc_object_t *, int , const char *, - const char *, va_list ); -static void FlushMsg ( msg_bank_t * ); -static void PrintMsg ( vlc_object_t *, msg_item_t * ); - -#if defined( WIN32 ) -static char *ConvertPrintfFormatString ( const char *psz_format ); +#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) #endif +#define QUEUE(i) p_this->p_libvlc->msg_bank.queues[i] +#define LOCK_BANK vlc_mutex_lock( &p_this->p_libvlc->msg_bank.lock ); +#define UNLOCK_BANK vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock ); + /***************************************************************************** - * msg_Create: initialize messages interface - ***************************************************************************** - * This functions has to be called before any call to other msg_* functions. - * It set up the locks and the message queue if it is used. + * Local prototypes *****************************************************************************/ +static void QueueMsg ( vlc_object_t *, int, 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( vlc_object_t *p_this ) { - /* Message queue initialization */ - vlc_mutex_init( p_this, &p_this->p_vlc->msg_bank.lock ); - - p_this->p_vlc->msg_bank.b_configured = VLC_FALSE; - p_this->p_vlc->msg_bank.b_overflow = VLC_FALSE; - - p_this->p_vlc->msg_bank.i_start = 0; - p_this->p_vlc->msg_bank.i_stop = 0; - - p_this->p_vlc->msg_bank.i_sub = 0; - p_this->p_vlc->msg_bank.pp_sub = NULL; + vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); + +#define QUEUE_INIT(i) \ + vlc_mutex_init( p_this, &QUEUE(i).lock ); \ + QUEUE(i).b_overflow = VLC_FALSE; \ + QUEUE(i).i_id = i; \ + QUEUE(i).i_start = 0; \ + QUEUE(i).i_stop = 0; \ + QUEUE(i).i_sub = 0; \ + QUEUE(i).pp_sub = 0; + + QUEUE_INIT( 0 ); + QUEUE_INIT( 1 ); + +#undef QUEUE_INIT + +#ifdef UNDER_CE + QUEUE(MSG_QUEUE_NORMAL).logfile = + CreateFile( L"vlc-log.txt", GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + CREATE_ALWAYS, 0, NULL ); + SetFilePointer( QUEUE(MSG_QUEUE_NORMAL).logfile, 0, NULL, FILE_END ); +#endif } -/***************************************************************************** - * msg_Flush: flush the message queue - *****************************************************************************/ +/** + * Flush all message queues + */ void __msg_Flush( vlc_object_t *p_this ) { - int i_index; - - vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock ); - - p_this->p_vlc->msg_bank.b_configured = VLC_TRUE; - - for( i_index = p_this->p_vlc->msg_bank.i_start; - i_index != p_this->p_vlc->msg_bank.i_stop; - i_index = (i_index+1) % VLC_MSG_QSIZE ) + int i; + for( i = 0 ; i < NB_QUEUES ; i++ ) { - PrintMsg( p_this, &p_this->p_vlc->msg_bank.msg[i_index] ); + vlc_mutex_lock( &QUEUE(i).lock ); + FlushMsg( &QUEUE(i) ); + vlc_mutex_unlock( &QUEUE(i).lock ); } - - FlushMsg( &p_this->p_vlc->msg_bank ); - - vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock ); } -/***************************************************************************** - * msg_Destroy: free resources allocated by msg_Create - ***************************************************************************** - * This functions prints all messages remaining in queue, then free all the - * resources allocated by msg_Create. +/** + * 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( vlc_object_t *p_this ) { - if( p_this->p_vlc->msg_bank.i_sub ) + int i; + for( i = NB_QUEUES -1 ; i >= 0; i-- ) { - msg_Err( p_this, "stale interface subscribers" ); - } + if( QUEUE(i).i_sub ) + msg_Err( p_this, "stale interface subscribers" ); - /* Flush the queue */ - if( !p_this->p_vlc->msg_bank.b_configured ) - { - msg_Flush( p_this ); - } - else - { - FlushMsg( &p_this->p_vlc->msg_bank ); - } + FlushMsg( &QUEUE(i) ); - /* Destroy lock */ - vlc_mutex_destroy( &p_this->p_vlc->msg_bank.lock ); +#ifdef UNDER_CE + if( i == MSG_QUEUE_NORMAL ) + CloseHandle( QUEUE(MSG_QUEUE_NORMAL).logfile ); +#endif + /* Destroy lock */ + vlc_mutex_destroy( &QUEUE(i).lock ); + } + vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) ); } -/***************************************************************************** - * msg_Subscribe: subscribe to the message queue. - *****************************************************************************/ -msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) +/** + * Subscribe to a message queue. + */ +msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i ) { msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) ); - vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock ); - - /* Add subscription to the list */ - p_this->p_vlc->msg_bank.i_sub++; - p_this->p_vlc->msg_bank.pp_sub = realloc( p_this->p_vlc->msg_bank.pp_sub, - p_this->p_vlc->msg_bank.i_sub * sizeof( msg_subscription_t* ) ); + assert( i < NB_QUEUES ); - p_this->p_vlc->msg_bank.pp_sub[ p_this->p_vlc->msg_bank.i_sub - 1 ] = p_sub; + LOCK_BANK; + vlc_mutex_lock( &QUEUE(i).lock ); - p_sub->i_start = p_this->p_vlc->msg_bank.i_start; - p_sub->pi_stop = &p_this->p_vlc->msg_bank.i_stop; + TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub ); - p_sub->p_msg = p_this->p_vlc->msg_bank.msg; - p_sub->p_lock = &p_this->p_vlc->msg_bank.lock; + p_sub->i_start = QUEUE(i).i_start; + p_sub->pi_stop = &QUEUE(i).i_stop; + p_sub->p_msg = QUEUE(i).msg; + p_sub->p_lock = &QUEUE(i).lock; - vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock ); + vlc_mutex_unlock( &QUEUE(i).lock ); + UNLOCK_BANK; return p_sub; } -/***************************************************************************** - * msg_Unsubscribe: unsubscribe from the message queue. - *****************************************************************************/ +/** + * Unsubscribe from a message queue. + */ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) { - int i_index; - - vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock ); + int i,j; - /* Sanity check */ - if( !p_this->p_vlc->msg_bank.i_sub ) + LOCK_BANK; + for( i = 0 ; i< NB_QUEUES ; i++ ) { - msg_Err( p_this, "no subscriber in the list" ); - return; - } - - /* Look for the appropriate subscription */ - for( i_index = 0; i_index < p_this->p_vlc->msg_bank.i_sub; i_index++ ) - { - if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] == p_sub ) + vlc_mutex_lock( &QUEUE(i).lock ); + for( j = 0 ; j< QUEUE(i).i_sub ; j++ ) { - break; + if( QUEUE(i).pp_sub[j] == p_sub ) + { + REMOVE_ELEM( QUEUE(i).pp_sub, QUEUE(i).i_sub, j ); + if( p_sub ) free( p_sub ); + } } + vlc_mutex_unlock( & QUEUE(i).lock ); } + UNLOCK_BANK; +} - if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] != p_sub ) - { - msg_Err( p_this, "subscriber not found" ); - vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock ); - return; - } - - /* Remove this subscription */ - for( ; i_index < (p_this->p_vlc->msg_bank.i_sub - 1); i_index++ ) - { - p_this->p_vlc->msg_bank.pp_sub[ i_index ] = p_this->p_vlc->msg_bank.pp_sub[ i_index+1 ]; - } - - p_this->p_vlc->msg_bank.i_sub--; - if( p_this->p_vlc->msg_bank.i_sub ) - { - p_this->p_vlc->msg_bank.pp_sub = realloc( p_this->p_vlc->msg_bank.pp_sub, - p_this->p_vlc->msg_bank.i_sub * sizeof( msg_subscription_t* ) ); - } - else +const char *msg_GetObjectTypeName(int i_object_type ) +{ + switch( i_object_type ) { - free( p_this->p_vlc->msg_bank.pp_sub ); - p_this->p_vlc->msg_bank.pp_sub = NULL; + case VLC_OBJECT_GLOBAL: return "global"; + case VLC_OBJECT_LIBVLC: return "libvlc"; + case VLC_OBJECT_MODULE: return "module"; + case VLC_OBJECT_INTF: return "interface"; + case VLC_OBJECT_PLAYLIST: return "playlist"; + case VLC_OBJECT_ITEM: return "item"; + case VLC_OBJECT_INPUT: return "input"; + case VLC_OBJECT_DECODER: return "decoder"; + case VLC_OBJECT_PACKETIZER: return "packetizer"; + case VLC_OBJECT_ENCODER: return "encoder"; + case VLC_OBJECT_VOUT: return "video output"; + case VLC_OBJECT_AOUT: return "audio output"; + case VLC_OBJECT_SOUT: return "stream output"; + case VLC_OBJECT_HTTPD: return "http server"; + case VLC_OBJECT_HTTPD_HOST: return "http server"; + case VLC_OBJECT_DIALOGS: return "dialogs provider"; + case VLC_OBJECT_VLM: return "vlm"; + case VLC_OBJECT_ANNOUNCE: return "announce handler"; + case VLC_OBJECT_DEMUX: return "demuxer"; + case VLC_OBJECT_ACCESS: return "access"; + case VLC_OBJECT_META_ENGINE: return "meta engine"; + default: return "private"; } - - - vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock ); } /***************************************************************************** @@ -212,60 +227,90 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) ***************************************************************************** * These functions queue a message for later printing. *****************************************************************************/ -void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, +void __msg_Generic( vlc_object_t *p_this, int i_queue, int i_type, + const char *psz_module, const char *psz_format, ... ) { va_list args; va_start( args, psz_format ); - QueueMsg( p_this, i_type, psz_module, psz_format, args ); + QueueMsg( p_this, i_queue, i_type, psz_module, psz_format, args ); va_end( args ); } +void __msg_GenericVa( vlc_object_t *p_this, int i_queue, + int i_type, const char *psz_module, + const char *psz_format, va_list args ) +{ + QueueMsg( p_this, i_queue, i_type, psz_module, psz_format, args ); +} + /* Generic functions used when variadic macros are not available. */ #define DECLARE_MSG_FN( FN_NAME, FN_TYPE ) \ - void FN_NAME( void *p_this, const char *psz_format, ... ) \ + void FN_NAME( vlc_object_t *p_this, const char *psz_format, ... ) \ { \ va_list args; \ va_start( args, psz_format ); \ - QueueMsg( (vlc_object_t *)p_this, FN_TYPE, "unknown", \ + QueueMsg( (vlc_object_t *)p_this,MSG_QUEUE_NORMAL, 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 ); -/***************************************************************************** - * QueueMsg: add a message to a queue - ***************************************************************************** +/** + * 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 QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, + const char *psz_module, + const char *psz_format, va_list _args ) { - msg_bank_t * p_bank = &p_this->p_vlc->msg_bank; /* message bank */ - char * psz_str = NULL; /* formatted message string */ - msg_item_t * p_item = NULL; /* pointer to message */ - msg_item_t item; /* message in case of a full queue */ -#ifdef WIN32 - char * psz_temp; -#endif -#ifndef HAVE_VASPRINTF - int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE; + 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 - /* - * Convert message to string - */ -#ifdef HAVE_VASPRINTF + if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET || + (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) + { + return; + } + + /* Convert message to string */ +#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS ) + vlc_va_copy( args, _args ); vasprintf( &psz_str, psz_format, args ); + va_end( args ); #else psz_str = (char*) malloc( i_size * sizeof(char) ); #endif @@ -274,36 +319,58 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, { fprintf( stderr, "main warning: can't store message (%s): ", strerror(errno) ); + vlc_va_copy( args, _args ); + /* We should use utf8_vfprintf - but it calls malloc()... */ vfprintf( stderr, psz_format, args ); - fprintf( stderr, "\n" ); + va_end( args ); + fputs( "\n", stderr ); return; } -#ifndef HAVE_VASPRINTF -# ifdef WIN32 - psz_temp = ConvertPrintfFormatString( psz_format ); - if( !psz_temp ) + i_header_size = 0; + p_obj = p_this; + while( p_obj != NULL ) { - fprintf( stderr, "main warning: couldn't print message\n" ); - return; + 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 ); + } + } + if( psz_old ) free( psz_old ); + p_obj = p_obj->p_parent; } - vsnprintf( psz_str, i_size, psz_temp, args ); - free( psz_temp ); -# else + +#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) + vlc_va_copy( args, _args ); vsnprintf( psz_str, i_size, psz_format, args ); -# endif + va_end( args ); psz_str[ i_size - 1 ] = 0; /* Just in case */ #endif - /* Put message in queue */ - vlc_mutex_lock( &p_bank->lock ); + assert( i_queue < NB_QUEUES ); + LOCK_BANK; + p_queue = &QUEUE(i_queue) ; + vlc_mutex_lock( &p_queue->lock ); /* Check there is room in the queue for our message */ - if( p_bank->b_overflow ) + if( p_queue->b_overflow ) { - FlushMsg( &p_this->p_vlc->msg_bank ); + FlushMsg( p_queue ); - if( ((p_bank->i_stop - p_bank->i_start + 1) % VLC_MSG_QSIZE) == 0 ) + 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; @@ -311,39 +378,42 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, else { /* Pheeew, at last, there is room in the queue! */ - p_bank->b_overflow = VLC_FALSE; + p_queue->b_overflow = VLC_FALSE; } } - else if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 ) + else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) { - FlushMsg( &p_this->p_vlc->msg_bank ); + FlushMsg( p_queue ); - if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 ) + if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) { - p_bank->b_overflow = VLC_TRUE; - - /* Put the overflow message in the queue */ - p_item = p_bank->msg + p_bank->i_stop; - p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE; - - p_item->i_type = VLC_MSG_ERR; - p_item->i_object_id = p_this->i_object_id; - p_item->i_object_type = p_this->i_object_type; - p_item->psz_module = strdup( "message" ); - p_item->psz_msg = strdup( "message queue overflowed" ); - - PrintMsg( p_this, p_item ); - - /* We print from a dummy item */ - p_item = &item; + p_queue->b_overflow = VLC_TRUE; + + if( p_queue->i_id == MSG_QUEUE_NORMAL ) + { + /* 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->i_object_type = p_this->i_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; + } } } - if( !p_bank->b_overflow ) + if( !p_queue->b_overflow ) { /* Put the message in the queue */ - p_item = p_bank->msg + p_bank->i_stop; - p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE; + p_item = p_queue->msg + p_queue->i_stop; + p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE; } /* Fill message information fields */ @@ -352,16 +422,23 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, p_item->i_object_type = p_this->i_object_type; p_item->psz_module = strdup( psz_module ); p_item->psz_msg = psz_str; + p_item->psz_header = psz_header; - PrintMsg( p_this, p_item ); + if( p_queue->i_id == MSG_QUEUE_NORMAL ) + PrintMsg( p_this, p_item ); - if( p_bank->b_overflow ) + if( p_queue->b_overflow ) { - free( p_item->psz_module ); - free( p_item->psz_msg ); + if( p_item->psz_module ) + free( p_item->psz_module ); + if( p_item->psz_msg ) + free( p_item->psz_msg ); + if( p_item->psz_header ) + free( p_item->psz_header ); } - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock ( &p_queue->lock ); + UNLOCK_BANK; } /* following functions are local */ @@ -372,50 +449,48 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, * Print all messages remaining in queue. MESSAGE QUEUE MUST BE LOCKED, since * this function does not check the lock. *****************************************************************************/ -static void FlushMsg ( msg_bank_t *p_bank ) +static void FlushMsg ( msg_queue_t *p_queue ) { int i_index, i_start, i_stop; - /* Only flush the queue if it has been properly configured */ - if( !p_bank->b_configured ) - { - return; - } - /* Get the maximum message index that can be freed */ - i_stop = p_bank->i_stop; + i_stop = p_queue->i_stop; /* Check until which value we can free messages */ - for( i_index = 0; i_index < p_bank->i_sub; i_index++ ) + for( i_index = 0; i_index < p_queue->i_sub; i_index++ ) { - i_start = p_bank->pp_sub[ i_index ]->i_start; + 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_bank->i_stop <= i_start || i_stop <= p_bank->i_stop) ) + && (p_queue->i_stop <= i_start || i_stop <= p_queue->i_stop) ) || ( i_stop < i_start - && (i_stop <= p_bank->i_stop && p_bank->i_stop <= i_start) ) ) + && (i_stop <= p_queue->i_stop && p_queue->i_stop <= i_start) ) ) { i_stop = i_start; } } /* Free message data */ - for( i_index = p_bank->i_start; + for( i_index = p_queue->i_start; i_index != i_stop; i_index = (i_index+1) % VLC_MSG_QSIZE ) { - free( p_bank->msg[i_index].psz_msg ); - free( p_bank->msg[i_index].psz_module ); + if( p_queue->msg[i_index].psz_msg ) + free( p_queue->msg[i_index].psz_msg ); + if( p_queue->msg[i_index].psz_module ) + free( p_queue->msg[i_index].psz_module ); + if( p_queue->msg[i_index].psz_header ) + free( p_queue->msg[i_index].psz_header ); } /* Update the new start value */ - p_bank->i_start = i_index; + p_queue->i_start = i_index; } /***************************************************************************** - * PrintMsg: output a message item to stderr + * PrintMsg: output a standard message item to stderr ***************************************************************************** * Print a message to stderr, with colour formatting if needed. *****************************************************************************/ @@ -428,110 +503,144 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) # define WHITE COL(37) # define GRAY "\033[0m" +#ifdef UNDER_CE + int i_dummy; +#endif static const char * ppsz_type[4] = { "", " error", " warning", " debug" }; static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY }; - char *psz_object = "private"; + const char *psz_object; int i_type = p_item->i_type; - if( p_this->p_vlc->b_quiet || !p_this->p_vlc->msg_bank.b_configured ) + switch( i_type ) { - return; + case VLC_MSG_ERR: + if( p_this->p_libvlc->i_verbose < 0 ) return; + break; + case VLC_MSG_INFO: + if( p_this->p_libvlc->i_verbose < 0 ) return; + break; + case VLC_MSG_WARN: + if( p_this->p_libvlc->i_verbose < 1 ) return; + break; + case VLC_MSG_DBG: + if( p_this->p_libvlc->i_verbose < 2 ) return; + break; } - if( !p_this->p_vlc->b_verbose && - ( (i_type == VLC_MSG_WARN) || (i_type == VLC_MSG_DBG) ) ) - { - return; - } + psz_object = msg_GetObjectTypeName(p_item->i_object_type); - switch( p_item->i_object_type ) - { - case VLC_OBJECT_ROOT: psz_object = "root"; break; - case VLC_OBJECT_MODULE: psz_object = "module"; break; - case VLC_OBJECT_INTF: psz_object = "interface"; break; - case VLC_OBJECT_PLAYLIST: psz_object = "playlist"; break; - case VLC_OBJECT_ITEM: psz_object = "item"; break; - case VLC_OBJECT_INPUT: psz_object = "input"; break; - case VLC_OBJECT_DECODER: psz_object = "decoder"; break; - case VLC_OBJECT_VOUT: psz_object = "video output"; break; - case VLC_OBJECT_AOUT: psz_object = "audio output"; break; - case VLC_OBJECT_SOUT: psz_object = "stream output"; break; - } +#ifdef UNDER_CE +# define CE_WRITE(str) WriteFile( QUEUE(MSG_QUEUE_NORMAL).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(MSG_QUEUE_NORMAL).logfile ); +#else /* Send the message to stderr */ - if( p_this->p_vlc->b_color ) + if( p_this->p_libvlc->b_color ) { - fprintf( stderr, "[" GREEN "%.2x" GRAY ":" GREEN "%.6x" GRAY "] " - "%s %s%s: %s%s" GRAY "\n", p_this->p_vlc->i_instance, + 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 { - fprintf( stderr, "[%.2x:%.6x] %s %s%s: %s\n", - p_this->p_vlc->i_instance, p_item->i_object_id, + 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 ); + } } + +# if defined(WIN32) + fflush( stderr ); +# endif +#endif } -/***************************************************************************** - * ConvertPrintfFormatString: replace all occurrences of %ll with %I64 in the - * printf format string. - ***************************************************************************** - * Win32 doesn't recognize the "%ll" format in a printf string, so we have - * to convert this string to something that win32 can handle. - * This is a REALLY UGLY HACK which won't even work in every situation, - * but hey I don't want to put an ifdef WIN32 each time I use printf with - * a "long long" type!!! - * By the way, if we don't do this we can sometimes end up with segfaults. - *****************************************************************************/ -#if defined( WIN32 ) -static char *ConvertPrintfFormatString( const char *psz_format ) +static msg_context_t* GetContext(void) { - int i, i_counter=0, i_pos=0; - char *psz_dest; - - /* We first need to check how many occurences of %ll there are in the - * psz_format string. Once we'll know that we'll be able to malloc the - * destination string */ - - if( strlen( psz_format ) <= 3 ) - return strdup( psz_format ); - - for( i=0; i <= (strlen(psz_format) - 3); i++ ) - { - if( !strncmp( (char *)(psz_format + i), "%ll", 3 ) ) - { - i_counter++; - } - } - - /* malloc the destination string */ - psz_dest = malloc( strlen(psz_format) + i_counter + 1 ); - if( psz_dest == NULL ) - { - fprintf( stderr, "main warning: ConvertPrintfFormatString failed\n" ); - return NULL; - } - - /* Now build the modified string */ - i_counter = 0; - for( i=0; i <= (strlen(psz_format) - 3); i++ ) - { - if( !strncmp( (char *)(psz_format + i), "%ll", 3 ) ) - { - memcpy( psz_dest+i_pos+i_counter, psz_format+i_pos, i-i_pos+1); - *(psz_dest+i+i_counter+1)='I'; - *(psz_dest+i+i_counter+2)='6'; - *(psz_dest+i+i_counter+3)='4'; - i_pos = i+3; - i_counter++; - } - } - strcpy( psz_dest+i_pos+i_counter, psz_format+i_pos ); - - return psz_dest; + 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; +} + +void msg_StackSet( int i_code, const char *psz_message, ... ) +{ + va_list ap; + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + va_start( ap, psz_message ); + if( p_ctx->psz_message != NULL ) + { + free( p_ctx->psz_message ); + } + + vasprintf( &p_ctx->psz_message, psz_message, ap ); + va_end( ap ); + p_ctx->i_code = i_code; +} + +void msg_StackAdd( const char *psz_message, ... ) +{ + char *psz_tmp; + va_list ap; + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + + va_start( ap, psz_message ); + vasprintf( &psz_tmp, psz_message, ap ); + va_end( ap ); + + if( !p_ctx->psz_message ) + p_ctx->psz_message = psz_tmp; + else + { + char *psz_old = malloc( strlen( p_ctx->psz_message ) + 1 ); + memcpy( psz_old, p_ctx->psz_message, strlen( p_ctx->psz_message ) + 1 ); + p_ctx->psz_message = realloc( p_ctx->psz_message, + strlen( p_ctx->psz_message ) + + /* ':', ' ', '0' */ + strlen( psz_tmp ) + 3 ); + sprintf( p_ctx->psz_message, "%s: %s", psz_tmp, psz_old ); + free( psz_tmp ); free( psz_old ); + } +} + +const char* msg_StackMsg( void ) +{ + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + return p_ctx->psz_message; } -#endif