X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=b86e6a7a68ff33d73e047c38ab380cbe1f7184e9;hb=06ecc0b06606d780410b41770840c4eeb6032135;hp=d6546f2ef1b414723eaeb45a2355867c8a6eff9e;hpb=28f793de74e3d1e3e2d5a1993fa6b713139b572b;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index d6546f2ef1..b86e6a7a68 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -3,8 +3,8 @@ * This library provides an interface to the message queue to be used by other * modules, especially intf modules. See config.h for output configuration. ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: messages.c,v 1.31 2003/05/08 19:06:47 titer Exp $ + * Copyright (C) 1998-2005 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -38,15 +38,24 @@ # include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ #endif -#ifdef HAVE_ERRNO_H -# include /* errno */ -#endif +#include /* errno */ #ifdef HAVE_UNISTD_H -#include /* close(), write() */ +# include /* close(), write() */ #endif -#include "interface.h" +#include "vlc_interface.h" + +/***************************************************************************** + * Local macros + *****************************************************************************/ +#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 /***************************************************************************** * Local prototypes @@ -56,12 +65,12 @@ static void QueueMsg ( vlc_object_t *, int , const char *, static void FlushMsg ( msg_bank_t * ); static void PrintMsg ( vlc_object_t *, msg_item_t * ); -/***************************************************************************** - * msg_Create: initialize messages interface - ***************************************************************************** +/** + * 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. - *****************************************************************************/ + */ void __msg_Create( vlc_object_t *p_this ) { /* Message queue initialization */ @@ -85,36 +94,37 @@ void __msg_Create( vlc_object_t *p_this ) #endif } -/***************************************************************************** - * msg_Flush: flush the message queue - *****************************************************************************/ +/** + * Flush the message queue + */ void __msg_Flush( vlc_object_t *p_this ) { - int i_index; - vlc_mutex_lock( &p_this->p_libvlc->msg_bank.lock ); p_this->p_libvlc->msg_bank.b_configured = VLC_TRUE; +#if 0 + /* Some messages remain in the queue, dont rewrite them */ for( i_index = p_this->p_libvlc->msg_bank.i_start; i_index != p_this->p_libvlc->msg_bank.i_stop; i_index = (i_index+1) % VLC_MSG_QSIZE ) { PrintMsg( p_this, &p_this->p_libvlc->msg_bank.msg[i_index] ); } +#endif FlushMsg( &p_this->p_libvlc->msg_bank ); vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock ); } -/***************************************************************************** - * msg_Destroy: free resources allocated by msg_Create - ***************************************************************************** +/** + * Free resources allocated by msg_Create + * * This functions prints all messages remaining in queue, then free all the * resources allocated by msg_Create. * No other messages interface functions should be called after this one. - *****************************************************************************/ + */ void __msg_Destroy( vlc_object_t *p_this ) { if( p_this->p_libvlc->msg_bank.i_sub ) @@ -140,9 +150,9 @@ void __msg_Destroy( vlc_object_t *p_this ) vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock ); } -/***************************************************************************** - * msg_Subscribe: subscribe to the message queue. - *****************************************************************************/ +/** + * Subscribe to the message queue. + */ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) { msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; @@ -164,9 +174,9 @@ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) return p_sub; } -/***************************************************************************** - * msg_Unsubscribe: unsubscribe from the message queue. - *****************************************************************************/ +/** + * Unsubscribe from the 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; @@ -200,6 +210,7 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) /* Remove this subscription */ REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index ); + if( p_sub ) free( p_sub ); vlc_mutex_unlock( &p_bank->lock ); } @@ -218,9 +229,15 @@ void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, va_end( args ); } +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_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 ); \ @@ -229,25 +246,39 @@ void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, 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 ) + const char *psz_format, va_list _args ) { msg_bank_t * p_bank = &p_this->p_libvlc->msg_bank; /* message bank */ char * psz_str = NULL; /* formatted message string */ + va_list args; msg_item_t * p_item = NULL; /* pointer to message */ msg_item_t item; /* message in case of a full queue */ @@ -259,26 +290,28 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, * Convert message to string */ #if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) && !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 if( psz_str == NULL ) { -#ifdef HAVE_ERRNO_H fprintf( stderr, "main warning: can't store message (%s): ", strerror(errno) ); -#else - fprintf( stderr, "main warning: can't store message: " ); -#endif + vlc_va_copy( args, _args ); vfprintf( stderr, psz_format, args ); + va_end( args ); fprintf( stderr, "\n" ); return; } -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) +#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 @@ -344,8 +377,10 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, if( p_bank->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 ); } vlc_mutex_unlock( &p_bank->lock ); @@ -393,8 +428,10 @@ static void FlushMsg ( msg_bank_t *p_bank ) 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_bank->msg[i_index].psz_msg ) + free( p_bank->msg[i_index].psz_msg ); + if( p_bank->msg[i_index].psz_module ) + free( p_bank->msg[i_index].psz_module ); } /* Update the new start value */ @@ -449,9 +486,17 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) 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; } #ifdef UNDER_CE