X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=f00a1de1ed6e32b4b786aa847d217a328384a2f4;hb=d59cd4abe53042b8611d1ec345e539144b59ce47;hp=8329c23815279142a8ad413a7b38c5d579d56cde;hpb=97d613b2309cbb5523379a4386326529f4f4fdc6;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 8329c23815..f00a1de1ed 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -28,7 +28,11 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include /* va_list for BSD */ @@ -38,6 +42,10 @@ #include /* errno */ +#ifdef WIN32 +# include /* 'net_strerror' and 'WSAGetLastError' */ +#endif + #ifdef HAVE_UNISTD_H # include /* close(), write() */ #endif @@ -45,6 +53,7 @@ #include #include +#include "../libvlc.h" /***************************************************************************** * Local macros @@ -57,59 +66,56 @@ # 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 ); +#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 inline char * object_description( vlc_object_t * p_this ) +{ + return strdup( p_this->psz_object_type ); +} + /** * 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) { - int i; - vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); - - 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; - } + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + vlc_mutex_init( &priv->msg_bank.lock ); + vlc_mutex_init( &QUEUE.lock ); + QUEUE.b_overflow = false; + QUEUE.i_start = 0; + QUEUE.i_stop = 0; + QUEUE.i_sub = 0; + QUEUE.pp_sub = 0; #ifdef UNDER_CE - QUEUE(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( QUEUE(MSG_QUEUE_NORMAL).logfile, 0, NULL, FILE_END ); + SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END ); #endif } /** * Flush all message queues */ -void __msg_Flush( vlc_object_t *p_this ) +void msg_Flush (libvlc_int_t *p_libvlc) { - int i; - for( i = 0 ; i < NB_QUEUES ; i++ ) - { - vlc_mutex_lock( &QUEUE(i).lock ); - FlushMsg( &QUEUE(i) ); - vlc_mutex_unlock( &QUEUE(i).lock ); - } + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + vlc_mutex_lock( &QUEUE.lock ); + FlushMsg( &QUEUE ); + vlc_mutex_unlock( &QUEUE.lock ); } /** @@ -119,46 +125,45 @@ void __msg_Flush( vlc_object_t *p_this ) * 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 = NB_QUEUES -1 ; i >= 0; i-- ) - { - if( QUEUE(i).i_sub ) - msg_Err( p_this, "stale interface subscribers" ); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + + if( QUEUE.i_sub ) + msg_Err( p_libvlc, "stale interface subscribers" ); - FlushMsg( &QUEUE(i) ); + FlushMsg( &QUEUE ); #ifdef UNDER_CE - if( i == MSG_QUEUE_NORMAL ) - CloseHandle( QUEUE(MSG_QUEUE_NORMAL).logfile ); + CloseHandle( QUEUE.logfile ); #endif - /* Destroy lock */ - vlc_mutex_destroy( &QUEUE(i).lock ); - } - vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) ); + /* Destroy lock */ + vlc_mutex_destroy( &QUEUE.lock ); + vlc_mutex_destroy( &priv->msg_bank.lock); } /** * Subscribe to a message queue. */ -msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i ) +msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) { + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) ); - assert( i < NB_QUEUES ); + if (p_sub == NULL) + return NULL; LOCK_BANK; - vlc_mutex_lock( &QUEUE(i).lock ); + vlc_mutex_lock( &QUEUE.lock ); - TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub ); + TAB_APPEND( QUEUE.i_sub, QUEUE.pp_sub, p_sub ); - 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; + 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( &QUEUE(i).lock ); + vlc_mutex_unlock( &QUEUE.lock ); UNLOCK_BANK; return p_sub; @@ -169,75 +174,41 @@ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i ) */ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) { - int i,j; + libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); LOCK_BANK; - for( i = 0 ; i< NB_QUEUES ; i++ ) + vlc_mutex_lock( &QUEUE.lock ); + for( int j = 0 ; j< QUEUE.i_sub ; j++ ) { - vlc_mutex_lock( &QUEUE(i).lock ); - for( j = 0 ; j< QUEUE(i).i_sub ; j++ ) + if( QUEUE.pp_sub[j] == p_sub ) { - 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 ); - } + REMOVE_ELEM( QUEUE.pp_sub, QUEUE.i_sub, j ); + free( p_sub ); } - vlc_mutex_unlock( & QUEUE(i).lock ); } + vlc_mutex_unlock( &QUEUE.lock ); UNLOCK_BANK; } -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"; - } -} - /***************************************************************************** * __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 ); + QueueMsg( 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, +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, 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. */ @@ -246,8 +217,7 @@ void __msg_GenericVa( vlc_object_t *p_this, int i_queue, { \ 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 _ @@ -278,10 +248,11 @@ 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, +static void QueueMsg( vlc_object_t *p_this, 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; char * psz_str = NULL; /* formatted message string */ @@ -295,17 +266,16 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE; #endif - 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; - } #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( ;; ) { @@ -371,7 +341,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, #ifdef __GLIBC__ fprintf( stderr, "main warning: can't store message (%m): " ); #else - char *psz_err[1001]; + 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() */ @@ -412,7 +382,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, p_obj->psz_header ); } } - if( psz_old ) free( psz_old ); + free( psz_old ); p_obj = p_obj->p_parent; } @@ -423,9 +393,8 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, psz_str[ i_size - 1 ] = 0; /* Just in case */ #endif - assert( i_queue < NB_QUEUES ); LOCK_BANK; - p_queue = &QUEUE(i_queue) ; + p_queue = &QUEUE; vlc_mutex_lock( &p_queue->lock ); /* Check there is room in the queue for our message */ @@ -441,7 +410,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, 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 ) @@ -450,25 +419,22 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, 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" ); - p_item->psz_header = NULL; - - 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 = p_this->i_object_id; + p_item->psz_object = object_description( p_this ); + 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; } } @@ -482,22 +448,19 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, 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 = object_description( p_this ); 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 ); - 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 ); + free( p_item->psz_object ); } vlc_mutex_unlock ( &p_queue->lock ); @@ -540,12 +503,10 @@ 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 ); + free( p_queue->msg[i_index].psz_object ); } /* Update the new start value */ @@ -569,31 +530,32 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) #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); 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); + psz_object = p_item->psz_object; #ifdef UNDER_CE -# define CE_WRITE(str) WriteFile( QUEUE(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( " " ); @@ -602,11 +564,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.logfile ); #else /* Send the message to stderr */ - if( p_this->p_libvlc->b_color ) + if( priv->b_color ) { if( p_item->psz_header ) { @@ -659,15 +621,24 @@ static msg_context_t* GetContext(void) 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(); - 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 ); @@ -680,7 +651,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 ) @@ -691,14 +664,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 ); } }