X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=906b489cb6e66eeea7022ad140fd049dd4799b1c;hb=69d7fdea2da6f773fd7993f78c2bea494eb2d819;hp=30f7e536cac178de2ffc0e174ae758a5338348de;hpb=d212ab721d8011ea7a2a1263d84d2b5afceae75e;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 30f7e536ca..906b489cb6 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -28,16 +28,24 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include /* va_list for BSD */ +#include -#ifdef HAVE_FCNTL_H -# include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ +#include /* va_list for BSD */ +#ifdef __APPLE__ +# include +#elif defined(HAVE_LOCALE_H) +# include #endif - #include /* errno */ +#ifdef WIN32 +# include /* 'net_strerror' and 'WSAGetLastError' */ +#endif + #ifdef HAVE_UNISTD_H # include /* close(), write() */ #endif @@ -45,6 +53,23 @@ #include #include +#include "../libvlc.h" + +typedef struct +{ + int i_code; + char * psz_message; +} msg_context_t; + +static void cleanup_msg_context (void *data) +{ + msg_context_t *ctx = data; + free (ctx->psz_message); + free (ctx); +} + +static vlc_threadvar_t msg_context; +static uintptr_t banks = 0; /***************************************************************************** * Local macros @@ -57,219 +82,200 @@ # 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 ); +static inline msg_bank_t *libvlc_bank (libvlc_int_t *inst) +{ + return (libvlc_priv (inst))->msg_bank; +} /***************************************************************************** * 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 * ); +static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX; + +/** + * Store all data required by messages interfaces. + */ +struct msg_bank_t +{ + /** Message queue lock */ + vlc_rwlock_t lock; + + /* Subscribers */ + int i_sub; + msg_subscription_t **pp_sub; + + locale_t locale; /**< C locale for error messages */ + vlc_dictionary_t enabled_objects; ///< Enabled objects + bool all_objects_enabled; ///< Should we print all objects? +}; + /** * Initialize messages queues * This function initializes all message queues */ -void __msg_Create( vlc_object_t *p_this ) +msg_bank_t *msg_Create (void) { - int i; - vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); + msg_bank_t *bank = malloc (sizeof (*bank)); - for( i = 0; i < 2; 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; - } + vlc_rwlock_init (&bank->lock); + vlc_dictionary_init (&bank->enabled_objects, 0); + bank->all_objects_enabled = true; -#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 + bank->i_sub = 0; + bank->pp_sub = NULL; + + /* C locale to get error messages in English in the logs */ + bank->locale = newlocale (LC_MESSAGES_MASK, "C", (locale_t)0); + + vlc_mutex_lock( &msg_stack_lock ); + if( banks++ == 0 ) + vlc_threadvar_create( &msg_context, cleanup_msg_context ); + vlc_mutex_unlock( &msg_stack_lock ); + return bank; } /** - * Flush all message queues + * Object Printing selection */ -void __msg_Flush( vlc_object_t *p_this ) +static void const * kObjectPrintingEnabled = &kObjectPrintingEnabled; +static void const * kObjectPrintingDisabled = &kObjectPrintingDisabled; + +#undef msg_EnableObjectPrinting +void msg_EnableObjectPrinting (vlc_object_t *obj, const char * psz_object) { - int i; - for( i = 0 ; i < NB_QUEUES ; i++ ) - { - vlc_mutex_lock( &QUEUE(i).lock ); - FlushMsg( &QUEUE(i) ); - vlc_mutex_unlock( &QUEUE(i).lock ); - } + msg_bank_t *bank = libvlc_bank (obj->p_libvlc); + + vlc_rwlock_wrlock (&bank->lock); + if( !strcmp(psz_object, "all") ) + bank->all_objects_enabled = true; + else + vlc_dictionary_insert (&bank->enabled_objects, psz_object, + (void *)kObjectPrintingEnabled); + vlc_rwlock_unlock (&bank->lock); +} + +#undef msg_DisableObjectPrinting +void msg_DisableObjectPrinting (vlc_object_t *obj, const char * psz_object) +{ + msg_bank_t *bank = libvlc_bank (obj->p_libvlc); + + vlc_rwlock_wrlock (&bank->lock); + if( !strcmp(psz_object, "all") ) + bank->all_objects_enabled = false; + else + vlc_dictionary_insert (&bank->enabled_objects, psz_object, + (void *)kObjectPrintingDisabled); + vlc_rwlock_unlock (&bank->lock); } /** * Destroy the message queues * * This functions prints all messages remaining in the queues, - * then frees all the allocated ressources + * then frees all the allocated resources * No other messages interface functions should be called after this one. */ -void __msg_Destroy( vlc_object_t *p_this ) +void msg_Destroy (msg_bank_t *bank) { - int i; - for( i = NB_QUEUES -1 ; i >= 0; i-- ) - { - if( QUEUE(i).i_sub ) - msg_Err( p_this, "stale interface subscribers" ); + if (unlikely(bank->i_sub != 0)) + fputs ("stale interface subscribers (LibVLC might crash)\n", stderr); - FlushMsg( &QUEUE(i) ); + vlc_mutex_lock( &msg_stack_lock ); + assert(banks > 0); + if( --banks == 0 ) + vlc_threadvar_delete( &msg_context ); + vlc_mutex_unlock( &msg_stack_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) ); + if (bank->locale != (locale_t)0) + freelocale (bank->locale); + + vlc_dictionary_clear (&bank->enabled_objects, NULL, NULL); + + vlc_rwlock_destroy (&bank->lock); + free (bank); } +struct msg_subscription_t +{ + libvlc_int_t *instance; + msg_callback_t func; + msg_cb_data_t *opaque; +}; + /** - * Subscribe to a message queue. + * Subscribe to the message queue. + * Whenever a message is emitted, a callback will be called. + * Callback invocation are serialized within a subscription. + * + * @param instance LibVLC instance to get messages from + * @param cb callback function + * @param opaque data for the callback function + * @return a subscription pointer, or NULL in case of failure */ -msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i ) +msg_subscription_t *msg_Subscribe (libvlc_int_t *instance, msg_callback_t cb, + msg_cb_data_t *opaque) { - msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) ); - - assert( i < NB_QUEUES ); + msg_subscription_t *sub = malloc (sizeof (*sub)); + if (sub == NULL) + return NULL; - LOCK_BANK; - vlc_mutex_lock( &QUEUE(i).lock ); + sub->instance = instance; + sub->func = cb; + sub->opaque = opaque; - TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub ); + msg_bank_t *bank = libvlc_bank (instance); + vlc_rwlock_wrlock (&bank->lock); + TAB_APPEND (bank->i_sub, bank->pp_sub, sub); + vlc_rwlock_unlock (&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( &QUEUE(i).lock ); - UNLOCK_BANK; - - return p_sub; + return sub; } /** - * Unsubscribe from a message queue. + * Unsubscribe from the message queue. + * This function waits for the message callback to return if needed. */ -void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) +void msg_Unsubscribe (msg_subscription_t *sub) { - int i,j; - - LOCK_BANK; - for( i = 0 ; i< NB_QUEUES ; i++ ) - { - vlc_mutex_lock( &QUEUE(i).lock ); - for( j = 0 ; j< QUEUE(i).i_sub ; j++ ) - { - 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; -} + msg_bank_t *bank = libvlc_bank (sub->instance); -const char *msg_GetObjectTypeName(int i_object_type ) -{ - switch( i_object_type ) - { - 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_rwlock_wrlock (&bank->lock); + TAB_REMOVE (bank->i_sub, bank->pp_sub, sub); + vlc_rwlock_unlock (&bank->lock); + free (sub); } /***************************************************************************** - * __msg_*: print a message + * msg_*: print a message ***************************************************************************** * These functions queue a message for later printing. *****************************************************************************/ -void __msg_Generic( vlc_object_t *p_this, int i_queue, 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, i_type, psz_module, psz_format, args ); + msg_GenericVa (p_this, 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( vlc_object_t *p_this, const char *psz_format, ... ) \ - { \ - va_list args; \ - va_start( args, psz_format ); \ - 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 + * Destroys a message. */ -DECLARE_MSG_FN( __msg_Warn, VLC_MSG_WARN ); -/** - * Output a debug message - */ -DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG ); +static void msg_Free (gc_object_t *gc) +{ + msg_item_t *msg = vlc_priv (gc, msg_item_t); + + free (msg->psz_module); + free (msg->psz_msg); + free (msg->psz_header); + free (msg); +} +#undef msg_GenericVa /** * Add a message to a queue * @@ -278,34 +284,31 @@ 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, int i_type, - const char *psz_module, - const char *psz_format, va_list _args ) +void msg_GenericVa (vlc_object_t *p_this, int i_type, + const char *psz_module, + const char *psz_format, va_list _args) { - int i_header_size; /* Size of the additionnal header */ + size_t 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 + assert (p_this); - if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET || + if( p_this->i_flags & OBJECT_FLAGS_QUIET || (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) - { return; - } + + msg_bank_t *bank = libvlc_bank (p_this->p_libvlc); + locale_t locale = uselocale (bank->locale); #ifndef __GLIBC__ /* Expand %m to strerror(errno) - only once */ char buf[strlen( psz_format ) + 2001], *ptr; strcpy( buf, psz_format ); - ptr = psz_format = buf; + ptr = (char*)buf; + psz_format = (const char*) buf; for( ;; ) { @@ -318,7 +321,19 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, 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 */ @@ -345,26 +360,47 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, #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 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 ); fputs( "\n", stderr ); + vlc_restorecancel (canc); + uselocale (locale); return; } + uselocale (locale); + + msg_item_t * p_item = malloc (sizeof (*p_item)); + if (p_item == NULL) + return; /* Uho! */ + + vlc_gc_init (p_item, msg_Free); + p_item->psz_module = p_item->psz_msg = p_item->psz_header = NULL; + + i_header_size = 0; p_obj = p_this; @@ -377,155 +413,39 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, if( psz_header ) { psz_old = strdup( psz_header ); - psz_header = (char*)realloc( psz_header, i_header_size ); + psz_header = xrealloc( 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 ); + psz_header = xmalloc( i_header_size ); snprintf( psz_header, i_header_size, "[%s]", p_obj->psz_header ); } } - if( psz_old ) free( psz_old ); + free( psz_old ); p_obj = p_obj->p_parent; } -#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 - - 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_queue->b_overflow ) - { - FlushMsg( p_queue ); - - 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 = VLC_FALSE; - } - } - else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) - { - FlushMsg( p_queue ); - - if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) - { - 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_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; - } - /* 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 ); - - 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 ); - if( p_item->psz_header ) - free( p_item->psz_header ); - } - - vlc_mutex_unlock ( &p_queue->lock ); - UNLOCK_BANK; -} - -/* following functions are local */ + PrintMsg( p_this, p_item ); -/***************************************************************************** - * 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 ) -{ - int i_index, i_start, i_stop; - - /* Get the maximum message index that can be freed */ - i_stop = p_queue->i_stop; - - /* 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; - } - } - - /* Free message data */ - for( i_index = p_queue->i_start; - i_index != i_stop; - i_index = (i_index+1) % VLC_MSG_QSIZE ) + vlc_rwlock_rdlock (&bank->lock); + for (int i = 0; i < bank->i_sub; i++) { - 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 ); + msg_subscription_t *sub = bank->pp_sub[i]; + sub->func (sub->opaque, p_item, 0); } - - /* Update the new start value */ - p_queue->i_start = i_index; + vlc_rwlock_unlock (&bank->lock); + msg_Release (p_item); } /***************************************************************************** @@ -539,98 +459,81 @@ 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 }; + 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); + msg_bank_t *bank = priv->msg_bank; 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; } - psz_object = msg_GetObjectTypeName(p_item->i_object_type); - -#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_libvlc->b_color ) - { - 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 ); - } - } + psz_object = p_item->psz_object_type; + void * val = vlc_dictionary_value_for_key (&bank->enabled_objects, + p_item->psz_module); + if( val == kObjectPrintingDisabled ) + return; + if( val == kObjectPrintingEnabled ) + /* Allowed */; 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 ); - } + val = vlc_dictionary_value_for_key (&bank->enabled_objects, + psz_object); + if( val == kObjectPrintingDisabled ) + return; + if( val == kObjectPrintingEnabled ) + /* Allowed */; + else if( !bank->all_objects_enabled ) + return; } -# if defined(WIN32) + int canc = vlc_savecancel (); + /* Send the message to stderr */ + 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 : "" ); + +#ifdef WIN32 fflush( stderr ); -# endif #endif + vlc_restorecancel (canc); } static msg_context_t* GetContext(void) { - msg_context_t *p_ctx = vlc_threadvar_get( &msg_context_global_key ); + msg_context_t *p_ctx = vlc_threadvar_get( msg_context ); if( p_ctx == NULL ) { - MALLOC_NULL( p_ctx, msg_context_t ); + p_ctx = malloc( sizeof( msg_context_t ) ); + if( !p_ctx ) + return NULL; p_ctx->psz_message = NULL; - vlc_threadvar_set( &msg_context_global_key, p_ctx ); + vlc_threadvar_set( msg_context, p_ctx ); } return p_ctx; } @@ -639,11 +542,12 @@ 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 == 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 ); @@ -656,7 +560,9 @@ void msg_StackAdd( const char *psz_message, ... ) char *psz_tmp; va_list ap; msg_context_t *p_ctx = GetContext(); - assert( p_ctx ); + + if( p_ctx == NULL ) + return; va_start( ap, psz_message ); if( vasprintf( &psz_tmp, psz_message, ap ) == -1 ) @@ -667,14 +573,13 @@ void msg_StackAdd( const char *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 ); + 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 ); } }