X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=ed866dc7df5da1fa8b98215cd81f6799aa89e8d1;hb=29a0b6307a5db17a02cf277a9eb7980382ad3a79;hp=3a2905a104397054769147bf335fd6a5cf57bf64;hpb=6ee349c97a50a61c7d81769fd22cd6a9a4a8aacf;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 3a2905a104..ed866dc7df 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -1,7 +1,7 @@ /***************************************************************************** * 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-2005 the VideoLAN team * $Id$ @@ -21,18 +21,20 @@ * * 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 /* required */ -#include /* va_list for BSD */ -#include /* malloc() */ -#include /* strerror() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include /* va_list for BSD */ #ifdef HAVE_FCNTL_H # include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ @@ -40,11 +42,27 @@ #include /* errno */ +#ifdef WIN32 +# include /* 'net_strerror' and 'WSAGetLastError' */ +#endif + #ifdef HAVE_UNISTD_H # include /* close(), write() */ #endif -#include "vlc_interface.h" +#include + +#include +#include "../libvlc.h" + +typedef struct +{ + int i_code; + char * psz_message; +} msg_context_t; + +static vlc_threadvar_t msg_context; +static uintptr_t banks = 0; /***************************************************************************** * Local macros @@ -57,174 +75,168 @@ # define vlc_va_copy(dest,src) (dest)=(src) #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, int , const char *, +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 * ); -static void CreateMsgQueue( vlc_object_t *p_this, int i_queue ); /** * Initialize messages queues * This function initializes all message queues */ -void __msg_Create( vlc_object_t *p_this ) +void msg_Create (libvlc_int_t *p_libvlc) { - vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); - - CreateMsgQueue( p_this, MSG_QUEUE_NORMAL ); - CreateMsgQueue( p_this, MSG_QUEUE_HTTPD_ACCESS ); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + vlc_mutex_init( &priv->msg_bank.lock ); + vlc_mutex_init( &QUEUE.lock ); + vlc_dictionary_init( &priv->msg_enabled_objects, 0 ); + priv->msg_all_objects_enabled = true; + + QUEUE.b_overflow = false; + QUEUE.i_start = 0; + QUEUE.i_stop = 0; + QUEUE.i_sub = 0; + QUEUE.pp_sub = 0; #ifdef UNDER_CE - p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile = + QUEUE.logfile = CreateFile( L"vlc-log.txt", GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL ); - SetFilePointer( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]-> - logfile, 0, NULL, FILE_END ); + SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END ); #endif + vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" ); + if( banks++ == 0 ) + vlc_threadvar_create( &msg_context, NULL ); + vlc_mutex_unlock( lock ); } -static void CreateMsgQueue( vlc_object_t *p_this, int i_queue ) +/** + * Flush all message queues + */ +void msg_Flush (libvlc_int_t *p_libvlc) { - msg_queue_t *p_queue = (msg_queue_t *)malloc( sizeof( msg_queue_t ) ); - - vlc_mutex_init( p_this, &p_queue->lock ); - - p_queue->b_overflow = VLC_FALSE; - p_queue->i_id = i_queue; - p_queue->i_start = 0; - p_queue->i_stop = 0; - - p_queue->i_sub = 0; - p_queue->pp_sub = NULL; - - INSERT_ELEM( p_this->p_libvlc->msg_bank.pp_queues, - p_this->p_libvlc->msg_bank.i_queues, - i_queue, - p_queue ); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + vlc_mutex_lock( &QUEUE.lock ); + FlushMsg( &QUEUE ); + vlc_mutex_unlock( &QUEUE.lock ); } + /** - * Flush all message queues + * Object Printing selection */ -void __msg_Flush( vlc_object_t *p_this ) +static void const * kObjectPrintingEnabled = (void *) 1; +static void const * kObjectPrintingDisabled = (void *) -1; + +void __msg_EnableObjectPrinting (vlc_object_t *p_this, char * psz_object) { - int i; + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); + vlc_mutex_lock( &QUEUE.lock ); + if( !strcmp(psz_object, "all") ) + priv->msg_all_objects_enabled = true; + else + vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingEnabled ); + vlc_mutex_unlock( &QUEUE.lock ); +} - for( i = 0 ; i < p_this->p_libvlc->msg_bank.i_queues; i++ ) - { - vlc_mutex_lock( &p_this->p_libvlc->msg_bank.pp_queues[i]->lock ); - FlushMsg( p_this->p_libvlc->msg_bank.pp_queues[i] ); - vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.pp_queues[i]->lock ); - } +void __msg_DisableObjectPrinting (vlc_object_t *p_this, char * psz_object) +{ + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); + vlc_mutex_lock( &QUEUE.lock ); + if( !strcmp(psz_object, "all") ) + priv->msg_all_objects_enabled = false; + else + vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingDisabled ); + vlc_mutex_unlock( &QUEUE.lock ); } /** - * Free resources allocated by msg_Create + * Destroy the message queues * - * This functions prints all messages remaining in the normal queue, + * 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 ) +void msg_Destroy (libvlc_int_t *p_libvlc) { - int i; - for( i = 0 ; i < p_this->p_libvlc->msg_bank.i_queues; i++ ) - { - msg_queue_t *p_queue = p_this->p_libvlc->msg_bank.pp_queues[i]; - if( p_queue->i_sub ) - { - msg_Err( p_this, "stale interface subscribers" ); - } - FlushMsg( p_queue ); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + + if( QUEUE.i_sub ) + msg_Err( p_libvlc, "stale interface subscribers" ); + + FlushMsg( &QUEUE ); + + vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" ); + if( --banks == 0 ) + vlc_threadvar_delete( &msg_context ); + vlc_mutex_unlock( lock ); #ifdef UNDER_CE - if( i == MSG_QUEUE_NORMAL ) - CloseHandle( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile ); + CloseHandle( QUEUE.logfile ); #endif - /* Destroy lock */ - vlc_mutex_destroy( &p_queue->lock ); - } - vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) ); + + vlc_dictionary_clear( &priv->msg_enabled_objects ); + + /* Destroy lock */ + vlc_mutex_destroy( &QUEUE.lock ); + vlc_mutex_destroy( &priv->msg_bank.lock); } /** - * Subscribe to the message queue. + * Subscribe to a message queue. */ -msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i_queue ) +msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) { - msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) ); - msg_queue_t *p_queue = NULL; - int i; - vlc_mutex_lock( &p_bank->lock ); - - for( i = 0 ; i i_queues ;i++ ) - { - if( p_bank->pp_queues[i]->i_id == i_queue ) - { - p_queue = p_bank->pp_queues[i]; - } - } - - if( p_queue == NULL ) - { - vlc_mutex_unlock( &p_bank->lock ); + if (p_sub == NULL) return NULL; - } - vlc_mutex_lock( &p_queue->lock ); - - /* Add subscription to the list */ - INSERT_ELEM( p_bank->pp_queues[i_queue]->pp_sub, - p_bank->pp_queues[i_queue]->i_sub, - p_bank->pp_queues[i_queue]->i_sub, - p_sub ); + LOCK_BANK; + vlc_mutex_lock( &QUEUE.lock ); - p_sub->i_start = p_queue->i_start; - p_sub->pi_stop = &p_queue->i_stop; + TAB_APPEND( QUEUE.i_sub, QUEUE.pp_sub, p_sub ); - p_sub->p_msg = p_queue->msg; - p_sub->p_lock = &p_queue->lock; + 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; - vlc_mutex_unlock( &p_queue->lock ); - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock( &QUEUE.lock ); + UNLOCK_BANK; return p_sub; } /** - * Unsubscribe from the message queue. + * Unsubscribe from a message queue. */ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) { - msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; - int i,j; + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); - vlc_mutex_lock( &p_bank->lock ); - - for( i = 0 ; i< p_bank->i_queues ; i++ ) + LOCK_BANK; + vlc_mutex_lock( &QUEUE.lock ); + for( int j = 0 ; j< QUEUE.i_sub ; j++ ) { - vlc_mutex_lock( & p_bank->pp_queues[i]->lock ); - for( j = 0 ; j< p_bank->pp_queues[i]->i_sub ; j++ ) + if( QUEUE.pp_sub[j] == p_sub ) { - if( p_bank->pp_queues[i]->pp_sub[j] == p_sub ) - { - REMOVE_ELEM( p_bank->pp_queues[i]->pp_sub, - p_bank->pp_queues[i]->i_sub, - j ); - if( p_sub ) free( p_sub ); - } + REMOVE_ELEM( QUEUE.pp_sub, QUEUE.i_sub, j ); + free( p_sub ); } - vlc_mutex_unlock( & p_bank->pp_queues[i]->lock ); } - - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock( &QUEUE.lock ); + UNLOCK_BANK; } /***************************************************************************** @@ -232,22 +244,20 @@ 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_queue_id, int i_type, - const char *psz_module, +void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, const char *psz_format, ... ) { va_list args; va_start( args, psz_format ); - QueueMsg( p_this, i_queue_id, i_type, psz_module, psz_format, args ); + QueueMsg( p_this, i_type, psz_module, psz_format, args ); va_end( args ); } -void __msg_GenericVa( vlc_object_t *p_this, int i_queue_id, - int i_type, const char *psz_module, +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_queue_id, i_type, psz_module, psz_format, args ); + QueueMsg( p_this, i_type, psz_module, psz_format, args ); } /* Generic functions used when variadic macros are not available. */ @@ -256,8 +266,7 @@ void __msg_GenericVa( vlc_object_t *p_this, int i_queue_id, { \ va_list args; \ va_start( args, psz_format ); \ - QueueMsg( (vlc_object_t *)p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \ - psz_format, args ); \ + QueueMsg( p_this, FN_TYPE, "unknown", psz_format, args ); \ va_end( args ); \ } \ struct _ @@ -288,63 +297,155 @@ DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG ); * 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_queue_id, int i_type, - const char *psz_module, +static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, const char *psz_format, va_list _args ) { - msg_bank_t * p_bank = &p_this->p_libvlc->msg_bank; /* message bank */ - msg_queue_t *p_queue = NULL; + 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(SYS_DARWIN) || defined(SYS_BEOS) +#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE; #endif - int i; - /* - * Convert message to string - */ -#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) && !defined( SYS_BEOS ) + if( p_this->i_flags & OBJECT_FLAGS_QUIET || + (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) + 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; + + for( ;; ) + { + ptr = strchr( ptr, '%' ); + if( ptr == NULL ) + break; + + if( ptr[1] == 'm' ) + { + char errbuf[2001]; + size_t errlen; + +#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 */ + } + + /* Looks for conversion specifier... */ + do + ptr++; + while( *ptr && ( strchr( "diouxXeEfFgGaAcspn%", *ptr ) == NULL ) ); + if( *ptr ) + ptr++; /* ...and skip it */ + } +#endif + + /* Convert message to string */ +#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS ) vlc_va_copy( args, _args ); - vasprintf( &psz_str, psz_format, args ); + if( vasprintf( &psz_str, psz_format, args ) == -1 ) + psz_str = NULL; va_end( args ); #else - psz_str = (char*) malloc( i_size * sizeof(char) ); + psz_str = (char*) malloc( i_size ); #endif if( psz_str == NULL ) { - fprintf( stderr, "main warning: can't store message (%s): ", - strerror(errno) ); + 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 ); - fprintf( stderr, "\n" ); + fputs( "\n", stderr ); + vlc_restorecancel (canc); return; } -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || 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 */ -#endif - - /* Put message in queue */ - vlc_mutex_lock( &p_bank->lock ); - for( i = 0 ; i i_queues ;i++ ) + i_header_size = 0; + p_obj = p_this; + while( p_obj != NULL ) { - if( p_bank->pp_queues[i]->i_id == i_queue_id ) + char *psz_old = NULL; + if( p_obj->psz_header ) { - p_queue = p_bank->pp_queues[i]; + 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; } - if( p_queue == NULL ) return; +#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 */ +#endif + LOCK_BANK; + p_queue = &QUEUE; vlc_mutex_lock( &p_queue->lock ); /* Check there is room in the queue for our message */ @@ -360,7 +461,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, else { /* Pheeew, at last, there is room in the queue! */ - p_queue->b_overflow = VLC_FALSE; + p_queue->b_overflow = false; } } else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) @@ -369,24 +470,22 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) { - p_queue->b_overflow = VLC_TRUE; + p_queue->b_overflow = 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" ); - - PrintMsg( p_this, p_item ); - /* We print from a dummy item */ - p_item = &item; - } + /* 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 = (uintptr_t)p_this; + 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; } } @@ -399,24 +498,23 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, /* Fill message information fields */ p_item->i_type = i_type; - p_item->i_object_id = p_this->i_object_id; - p_item->i_object_type = p_this->i_object_type; + p_item->i_object_id = (uintptr_t)p_this; + 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; - if( p_queue->i_id == MSG_QUEUE_NORMAL ) - PrintMsg( p_this, p_item ); + PrintMsg( p_this, p_item ); if( p_queue->b_overflow ) { - if( p_item->psz_module ) - free( p_item->psz_module ); - if( p_item->psz_msg ) - free( p_item->psz_msg ); + free( p_item->psz_module ); + free( p_item->psz_msg ); + free( p_item->psz_header ); } vlc_mutex_unlock ( &p_queue->lock ); - vlc_mutex_unlock( &p_bank->lock ); + UNLOCK_BANK; } /* following functions are local */ @@ -455,10 +553,9 @@ static void FlushMsg ( msg_queue_t *p_queue ) i_index != i_stop; i_index = (i_index+1) % VLC_MSG_QSIZE ) { - 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 ); + free( p_queue->msg[i_index].psz_msg ); + free( p_queue->msg[i_index].psz_module ); + free( p_queue->msg[i_index].psz_header ); } /* Update the new start value */ @@ -476,58 +573,56 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) # define RED COL(31) # define GREEN COL(32) # define YELLOW COL(33) -# define WHITE COL(37) +# define WHITE COL(0) # 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"; + 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; switch( i_type ) { case VLC_MSG_ERR: - if( p_this->p_libvlc->i_verbose < 0 ) return; + if( priv->i_verbose < 0 ) return; break; case VLC_MSG_INFO: - if( p_this->p_libvlc->i_verbose < 0 ) return; + if( priv->i_verbose < 0 ) return; break; case VLC_MSG_WARN: - if( p_this->p_libvlc->i_verbose < 1 ) return; + if( priv->i_verbose < 1 ) return; break; case VLC_MSG_DBG: - if( p_this->p_libvlc->i_verbose < 2 ) return; + if( priv->i_verbose < 2 ) return; break; } - switch( p_item->i_object_type ) + psz_object = p_item->psz_object_type; + void * val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects, + p_item->psz_module ); + if( val == kObjectPrintingDisabled ) + return; + if( val == kObjectPrintingEnabled ) + /* Allowed */; + else { - case VLC_OBJECT_ROOT: psz_object = "root"; break; - case VLC_OBJECT_VLC: psz_object = "vlc"; 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_PACKETIZER: psz_object = "packetizer"; break; - case VLC_OBJECT_ENCODER: psz_object = "encoder"; 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; - case VLC_OBJECT_HTTPD: psz_object = "http daemon"; break; - case VLC_OBJECT_DIALOGS: psz_object = "dialogs provider"; break; - case VLC_OBJECT_VLM: psz_object = "vlm"; break; - case VLC_OBJECT_ANNOUNCE: psz_object = "announce handler"; break; - case VLC_OBJECT_DEMUX: psz_object = "demuxer"; break; - case VLC_OBJECT_ACCESS: psz_object = "access"; break; + val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects, + psz_object ); + if( val == kObjectPrintingDisabled ) + return; + if( val == kObjectPrintingEnabled ) + /* Allowed */; + else if( !priv->msg_all_objects_enabled ) + return; } + int canc = vlc_savecancel (); #ifdef UNDER_CE -# define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile, \ +# define CE_WRITE(str) WriteFile( QUEUE.logfile, \ str, strlen(str), &i_dummy, NULL ); CE_WRITE( p_item->psz_module ); CE_WRITE( " " ); @@ -536,26 +631,97 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) CE_WRITE( ": " ); CE_WRITE( p_item->psz_msg ); CE_WRITE( "\r\n" ); - FlushFileBuffers( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile ); + FlushFileBuffers( QUEUE.logfile ); #else /* Send the message to stderr */ - if( p_this->p_libvlc->b_color ) + utf8_fprintf( stderr, "[%s%p%s] %s%s%s %s%s: %s%s%s\n", + priv->b_color ? GREEN : "", + (void *)p_item->i_object_id, + priv->b_color ? GRAY : "", + p_item->psz_header ? p_item->psz_header : "", + p_item->psz_header ? " " : "", + p_item->psz_module, psz_object, + ppsz_type[i_type], + priv->b_color ? ppsz_color[i_type] : "", + p_item->psz_msg, + priv->b_color ? GRAY : "" ); + +# if defined(WIN32) + fflush( stderr ); +# endif + vlc_restorecancel (canc); +#endif +} + +static msg_context_t* GetContext(void) +{ + msg_context_t *p_ctx = vlc_threadvar_get( &msg_context ); + if( p_ctx == NULL ) { - 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 ); + MALLOC_NULL( p_ctx, msg_context_t ); + p_ctx->psz_message = NULL; + vlc_threadvar_set( &msg_context, p_ctx ); } + return p_ctx; +} + +void msg_StackDestroy (void *data) +{ + msg_context_t *p_ctx = data; + + free (p_ctx->psz_message); + free (p_ctx); +} + +void msg_StackSet( int i_code, const char *psz_message, ... ) +{ + va_list ap; + msg_context_t *p_ctx = GetContext(); + + if( p_ctx == 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 ); + + 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(); + + if( p_ctx == 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; else { - 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 ); + 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 ); } +} -# if defined(WIN32) - fflush( stderr ); -# endif -#endif +const char* msg_StackMsg( void ) +{ + msg_context_t *p_ctx = GetContext(); + assert( p_ctx ); + return p_ctx->psz_message; }