X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=b55a3e6d90e9bf0c5c794406bca774adbb5c623a;hb=80ddb522d75cca49a7337c62431709be670c9bdd;hp=090f72a0ae9ed069eb2bc40c7d74249312c3458c;hpb=121930fed7dbc51c93f4eca072fed415baa29041;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 090f72a0ae..b55a3e6d90 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$ @@ -28,13 +28,13 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include /* required */ #include /* va_list for BSD */ -#include /* malloc() */ -#include /* strerror() */ - #ifdef HAVE_FCNTL_H # include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ @@ -42,12 +42,18 @@ #include /* errno */ +#ifdef WIN32 +# include /* 'net_strerror' and 'WSAGetLastError' */ +#endif + #ifdef HAVE_UNISTD_H # include /* close(), write() */ #endif -#include "vlc_interface.h" -#include "charset.h" +#include + +#include +#include "../libvlc.h" /***************************************************************************** * Local macros @@ -60,7 +66,9 @@ # define vlc_va_copy(dest,src) (dest)=(src) #endif -#define QUEUE(i) p_this->p_libvlc->msg_bank.pp_queues[i] +#define QUEUE(i) priv->msg_bank.queues[i] +#define LOCK_BANK vlc_mutex_lock( &priv->msg_bank.lock ); +#define UNLOCK_BANK vlc_mutex_unlock( &priv->msg_bank.lock ); /***************************************************************************** * Local prototypes @@ -69,169 +77,130 @@ 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 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) ); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + vlc_mutex_init( &priv->msg_bank.lock ); - CreateMsgQueue( p_this, MSG_QUEUE_NORMAL ); - CreateMsgQueue( p_this, MSG_QUEUE_HTTPD_ACCESS ); + for( int i = 0; i < 2; i++ ) + { + vlc_mutex_init( &QUEUE(i).lock ); + QUEUE(i).b_overflow = 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; + } #ifdef UNDER_CE - QUEUE(MSG_QUEUE_NORMAL)->logfile = + 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 ); + SetFilePointer( QUEUE(MSG_QUEUE_NORMAL).logfile, 0, NULL, FILE_END ); #endif - -} - -static void CreateMsgQueue( vlc_object_t *p_this, int i_queue ) -{ - 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 ); } /** * Flush all message queues */ -void __msg_Flush( vlc_object_t *p_this ) +void msg_Flush (libvlc_int_t *p_libvlc) { - int i; + libvlc_priv_t *priv = libvlc_priv (p_libvlc); - for( i = 0 ; i < p_this->p_libvlc->msg_bank.i_queues; i++ ) + for( int i = 0 ; i < NB_QUEUES ; i++ ) { - vlc_mutex_lock( &QUEUE(i)->lock ); - FlushMsg( QUEUE(i) ); - vlc_mutex_unlock( &QUEUE(i)->lock ); + vlc_mutex_lock( &QUEUE(i).lock ); + FlushMsg( &QUEUE(i) ); + vlc_mutex_unlock( &QUEUE(i).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 = p_this->p_libvlc->msg_bank.i_queues -1 ; i >= 0; i-- ) + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + + for( int i = NB_QUEUES -1 ; i >= 0; i-- ) { - msg_queue_t *p_queue = QUEUE(i); - if( p_queue->i_sub ) - { - msg_Err( p_this, "stale interface subscribers" ); - } - FlushMsg( p_queue ); + if( QUEUE(i).i_sub ) + msg_Err( p_libvlc, "stale interface subscribers" ); + + FlushMsg( &QUEUE(i) ); #ifdef UNDER_CE if( i == MSG_QUEUE_NORMAL ) - CloseHandle( QUEUE(MSG_QUEUE_NORMAL)->logfile ); + CloseHandle( QUEUE(MSG_QUEUE_NORMAL).logfile ); #endif /* Destroy lock */ - vlc_mutex_destroy( &p_queue->lock ); - REMOVE_ELEM( p_this->p_libvlc->msg_bank.pp_queues, - p_this->p_libvlc->msg_bank.i_queues, i ); - free( p_queue ); + vlc_mutex_destroy( &QUEUE(i).lock ); } - vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.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, int i ) { - 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( QUEUE(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 ); + assert( i < NB_QUEUES ); - /* 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(i).lock ); - p_sub->i_start = p_queue->i_start; - p_sub->pi_stop = &p_queue->i_stop; + TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub ); - p_sub->p_msg = p_queue->msg; - p_sub->p_lock = &p_queue->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_queue->lock ); - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock( &QUEUE(i).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; - - vlc_mutex_lock( &p_bank->lock ); + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); - for( i = 0 ; i< p_bank->i_queues ; i++ ) + LOCK_BANK; + for( int i = 0 ; i< NB_QUEUES ; i++ ) { - vlc_mutex_lock( & p_bank->pp_queues[i]->lock ); - for( j = 0 ; j< p_bank->pp_queues[i]->i_sub ; j++ ) + vlc_mutex_lock( &QUEUE(i).lock ); + for( int j = 0 ; j< QUEUE(i).i_sub ; j++ ) { - if( p_bank->pp_queues[i]->pp_sub[j] == p_sub ) + if( QUEUE(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(i).pp_sub, QUEUE(i).i_sub, j ); + free( p_sub ); } } - vlc_mutex_unlock( & p_bank->pp_queues[i]->lock ); + vlc_mutex_unlock( & QUEUE(i).lock ); } - - vlc_mutex_unlock( &p_bank->lock ); + UNLOCK_BANK; } /***************************************************************************** @@ -239,22 +208,22 @@ 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, +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_queue_id, 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_id, +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_id, i_type, psz_module, psz_format, args ); + QueueMsg( p_this, i_queue, i_type, psz_module, psz_format, args ); } /* Generic functions used when variadic macros are not available. */ @@ -263,7 +232,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", \ + QueueMsg( p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \ psz_format, args ); \ va_end( args ); \ } \ @@ -295,48 +264,111 @@ 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, +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 ) { + 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; - msg_bank_t *p_bank; /* message bank */ - msg_queue_t *p_queue = NULL; 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 - int i; - 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; - } - p_bank = &p_this->p_libvlc->msg_bank; +#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 */ + } - /* - * Convert message to string - */ + /* 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) ); +#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 ); @@ -350,7 +382,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, while( p_obj != NULL ) { char *psz_old = NULL; - if( p_obj == NULL ) break; if( p_obj->psz_header ) { i_header_size += strlen( p_obj->psz_header ) + 4; @@ -368,7 +399,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, p_obj->psz_header ); } } - if( psz_old ) free( psz_old ); + free( psz_old ); p_obj = p_obj->p_parent; } @@ -379,24 +410,9 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, 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++ ) - { - if( p_bank->pp_queues[i]->i_id == i_queue_id ) - { - p_queue = p_bank->pp_queues[i]; - } - } - - if( p_queue == NULL ) - { - vlc_mutex_unlock( &p_bank->lock ); - if( psz_str ) free( psz_str ); - if( psz_header ) free( psz_header ); - return; - } - + 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 */ @@ -412,7 +428,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 ) @@ -421,7 +437,7 @@ 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 ) { @@ -431,7 +447,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, 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_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; @@ -453,7 +469,7 @@ 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->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; @@ -463,16 +479,13 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, 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 ); + 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 */ @@ -511,12 +524,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 ); - if( p_queue->msg[i_index].psz_header ) - free( p_queue->msg[i_index].psz_header ); + 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 */ @@ -534,7 +544,7 @@ 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 @@ -542,51 +552,30 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) #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; + 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 ) - { - case VLC_OBJECT_ROOT: psz_object = "root"; break; - case VLC_OBJECT_LIBVLC: psz_object = "libvlc"; 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 server"; break; - case VLC_OBJECT_HTTPD_HOST: psz_object = "http server"; 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; - } + psz_object = p_item->psz_object_type; #ifdef UNDER_CE -# define CE_WRITE(str) WriteFile( QUEUE(MSG_QUEUE_NORMAL)->logfile, \ +# define CE_WRITE(str) WriteFile( QUEUE(MSG_QUEUE_NORMAL).logfile, \ str, strlen(str), &i_dummy, NULL ); CE_WRITE( p_item->psz_module ); CE_WRITE( " " ); @@ -595,11 +584,11 @@ 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( QUEUE(MSG_QUEUE_NORMAL)->logfile ); + FlushFileBuffers( QUEUE(MSG_QUEUE_NORMAL).logfile ); #else /* Send the message to stderr */ - if( p_this->p_libvlc->b_color ) + if( priv->b_color ) { if( p_item->psz_header ) { @@ -639,3 +628,65 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) # endif #endif } + +static msg_context_t* GetContext(void) +{ + 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 ); + free( p_ctx->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(); + assert( p_ctx ); + + 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 + { + 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; +}