/*****************************************************************************
* 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-2002 VideoLAN
- * $Id: messages.c,v 1.5 2002/07/23 00:30:22 sam Exp $
+ * Copyright (C) 1998-2005 the VideoLAN team
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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 <errno.h> /* errno */
-#include <fcntl.h> /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
-#include <stdio.h> /* required */
-#include <stdarg.h> /* va_list for BSD */
-#include <stdlib.h> /* malloc() */
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* close(), write() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include "interface.h"
+#include <vlc_common.h>
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void QueueMsg ( vlc_object_t *, int , const char *,
- const char *, va_list );
-static void FlushMsg ( msg_bank_t * );
-static void PrintMsg ( vlc_object_t *, msg_item_t * );
+#include <stdarg.h> /* va_list for BSD */
+
+#include <errno.h> /* errno */
-#if defined( WIN32 )
-static char *ConvertPrintfFormatString ( const char *psz_format );
+#ifdef WIN32
+# include <vlc_network.h> /* 'net_strerror' and 'WSAGetLastError' */
#endif
-/*****************************************************************************
- * msg_Create: 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 */
- vlc_mutex_init( p_this, &p_this->p_vlc->msg_bank.lock );
+#ifdef HAVE_UNISTD_H
+# include <unistd.h> /* close(), write() */
+#endif
- p_this->p_vlc->msg_bank.i_start = 0;
- p_this->p_vlc->msg_bank.i_stop = 0;
+#include <assert.h>
- p_this->p_vlc->msg_bank.i_sub = 0;
- p_this->p_vlc->msg_bank.pp_sub = NULL;
-}
+#include <vlc_charset.h>
+#include "../libvlc.h"
-/*****************************************************************************
- * msg_Flush: flush the message queue
- *****************************************************************************/
-void __msg_Flush( vlc_object_t *p_this )
+typedef struct
{
- int i_index;
+ int i_code;
+ char * psz_message;
+} msg_context_t;
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+static void cleanup_msg_context (void *data)
+{
+ msg_context_t *ctx = data;
+ free (ctx->psz_message);
+ free (ctx);
+}
- for( i_index = p_this->p_vlc->msg_bank.i_start;
- i_index != p_this->p_vlc->msg_bank.i_stop;
- i_index = (i_index+1) % VLC_MSG_QSIZE )
- {
- PrintMsg( p_this, &p_this->p_vlc->msg_bank.msg[i_index] );
- }
+static vlc_threadvar_t msg_context;
+static uintptr_t banks = 0;
- FlushMsg( &p_this->p_vlc->msg_bank );
+/*****************************************************************************
+ * 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
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+#define QUEUE priv->msg_bank
+static inline msg_bank_t *libvlc_bank (libvlc_int_t *inst)
+{
+ return &(libvlc_priv (inst))->msg_bank;
}
/*****************************************************************************
- * msg_Destroy: 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.
+ * Local prototypes
*****************************************************************************/
-void __msg_Destroy( vlc_object_t *p_this )
-{
- /* Destroy lock */
- vlc_mutex_destroy( &p_this->p_vlc->msg_bank.lock );
+static void QueueMsg ( vlc_object_t *, int, const char *,
+ const char *, va_list );
+static void PrintMsg ( vlc_object_t *, msg_item_t * );
- if( p_this->p_vlc->msg_bank.i_sub )
- {
- fprintf( stderr, "main error: stale interface subscribers\n" );
- }
+static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
- /* Free remaining messages */
- FlushMsg( &p_this->p_vlc->msg_bank );
+/**
+ * Initialize messages queues
+ * This function initializes all message queues
+ */
+void msg_Create (libvlc_int_t *p_libvlc)
+{
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+ msg_bank_t *bank = libvlc_bank (p_libvlc);
+
+ vlc_rwlock_init (&bank->lock);
+ vlc_dictionary_init( &priv->msg_enabled_objects, 0 );
+ priv->msg_all_objects_enabled = true;
+
+ QUEUE.i_sub = 0;
+ QUEUE.pp_sub = NULL;
+
+#ifdef UNDER_CE
+ QUEUE.logfile =
+ CreateFile( L"vlc-log.txt", GENERIC_WRITE,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ CREATE_ALWAYS, 0, NULL );
+ SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
+#endif
+
+ vlc_mutex_lock( &msg_stack_lock );
+ if( banks++ == 0 )
+ vlc_threadvar_create( &msg_context, cleanup_msg_context );
+ vlc_mutex_unlock( &msg_stack_lock );
}
-/*****************************************************************************
- * msg_Subscribe: subscribe to the message queue.
- *****************************************************************************/
-msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
+/**
+ * Object Printing selection
+ */
+static void const * kObjectPrintingEnabled = &kObjectPrintingEnabled;
+static void const * kObjectPrintingDisabled = &kObjectPrintingDisabled;
+
+void __msg_EnableObjectPrinting (vlc_object_t *p_this, const char * psz_object)
{
- msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+ vlc_rwlock_wrlock( &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_rwlock_unlock( &QUEUE.lock );
+}
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+void __msg_DisableObjectPrinting (vlc_object_t *p_this, const char * psz_object)
+{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+ vlc_rwlock_wrlock( &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_rwlock_unlock( &QUEUE.lock );
+}
- /* Add subscription to the list */
- p_this->p_vlc->msg_bank.i_sub++;
- p_this->p_vlc->msg_bank.pp_sub = realloc( p_this->p_vlc->msg_bank.pp_sub,
- p_this->p_vlc->msg_bank.i_sub * sizeof( msg_subscription_t* ) );
+/**
+ * Destroy the message queues
+ *
+ * This functions prints all messages remaining in the queues,
+ * then frees all the allocated resources
+ * No other messages interface functions should be called after this one.
+ */
+void msg_Destroy (libvlc_int_t *p_libvlc)
+{
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+ msg_bank_t *bank = libvlc_bank (p_libvlc);
- p_this->p_vlc->msg_bank.pp_sub[ p_this->p_vlc->msg_bank.i_sub - 1 ] = p_sub;
+ if( QUEUE.i_sub )
+ msg_Err( p_libvlc, "stale interface subscribers (VLC might crash)" );
- p_sub->i_start = p_this->p_vlc->msg_bank.i_start;
- p_sub->pi_stop = &p_this->p_vlc->msg_bank.i_stop;
+ vlc_mutex_lock( &msg_stack_lock );
+ assert(banks > 0);
+ if( --banks == 0 )
+ vlc_threadvar_delete( &msg_context );
+ vlc_mutex_unlock( &msg_stack_lock );
- p_sub->p_msg = p_this->p_vlc->msg_bank.msg;
- p_sub->p_lock = &p_this->p_vlc->msg_bank.lock;
+#ifdef UNDER_CE
+ CloseHandle( QUEUE.logfile );
+#endif
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_dictionary_clear( &priv->msg_enabled_objects, NULL, NULL );
- return p_sub;
+ vlc_rwlock_destroy (&bank->lock);
}
-/*****************************************************************************
- * msg_Unsubscribe: unsubscribe from the message queue.
- *****************************************************************************/
-void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
+struct msg_subscription_t
{
- int i_index;
-
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ libvlc_int_t *instance;
+ msg_callback_t func;
+ msg_cb_data_t *opaque;
+};
+
+/**
+ * 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 (libvlc_int_t *instance, msg_callback_t cb,
+ msg_cb_data_t *opaque)
+{
+ msg_subscription_t *sub = malloc (sizeof (*sub));
+ if (sub == NULL)
+ return NULL;
- /* Sanity check */
- if( !p_this->p_vlc->msg_bank.i_sub )
- {
- msg_Err( p_this, "no subscriber in the list" );
- return;
- }
+ sub->instance = instance;
+ sub->func = cb;
+ sub->opaque = opaque;
- /* Look for the appropriate subscription */
- for( i_index = 0; i_index < p_this->p_vlc->msg_bank.i_sub; i_index++ )
- {
- if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] == p_sub )
- {
- break;
- }
- }
+ 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);
- if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] != p_sub )
- {
- msg_Err( p_this, "subscriber not found" );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
- return;
- }
-
- /* Remove this subscription */
- for( ; i_index < (p_this->p_vlc->msg_bank.i_sub - 1); i_index++ )
- {
- p_this->p_vlc->msg_bank.pp_sub[ i_index ] = p_this->p_vlc->msg_bank.pp_sub[ i_index+1 ];
- }
-
- p_this->p_vlc->msg_bank.i_sub--;
- if( p_this->p_vlc->msg_bank.i_sub )
- {
- p_this->p_vlc->msg_bank.pp_sub = realloc( p_this->p_vlc->msg_bank.pp_sub,
- p_this->p_vlc->msg_bank.i_sub * sizeof( msg_subscription_t* ) );
- }
- else
- {
- free( p_this->p_vlc->msg_bank.pp_sub );
- p_this->p_vlc->msg_bank.pp_sub = NULL;
- }
+ return sub;
+}
+/**
+ * Unsubscribe from the message queue.
+ * This function waits for the message callback to return if needed.
+ */
+void msg_Unsubscribe (msg_subscription_t *sub)
+{
+ msg_bank_t *bank = libvlc_bank (sub->instance);
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_rwlock_wrlock (&bank->lock);
+ TAB_REMOVE (bank->i_sub, bank->pp_sub, sub);
+ vlc_rwlock_unlock (&bank->lock);
+ free (sub);
}
/*****************************************************************************
va_end( 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, ... ) \
- { \
- va_list args; \
- va_start( args, psz_format ); \
- QueueMsg( (vlc_object_t *)p_this, FN_TYPE, "unknown", \
- psz_format, args ); \
- 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 );
+}
-DECLARE_MSG_FN( __msg_Info, VLC_MSG_INFO );
-DECLARE_MSG_FN( __msg_Err, VLC_MSG_ERR );
-DECLARE_MSG_FN( __msg_Warn, VLC_MSG_WARN );
-DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG );
+/**
+ * Destroys a message.
+ */
+static void msg_Free (gc_object_t *gc)
+{
+ msg_item_t *msg = vlc_priv (gc, msg_item_t);
-/*****************************************************************************
- * QueueMsg: add a message to a queue
- *****************************************************************************
+ free (msg->psz_module);
+ free (msg->psz_msg);
+ free (msg->psz_header);
+ free (msg);
+}
+
+/**
+ * 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 )
{
- char * psz_str = NULL; /* formatted message string */
- msg_item_t * p_item; /* pointer to message */
- msg_item_t item; /* message in case of a full queue */
-#ifdef WIN32
- char * psz_temp;
-#endif
+ 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;
+
+ 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;
- /*
- * Convert message to string
- */
-#ifdef HAVE_VASPRINTF
- vasprintf( &psz_str, psz_format, args );
+#ifndef WIN32
+ strerror_r( errno, errbuf, 1001 );
#else
- psz_str = (char*) malloc( strlen(psz_format) + INTF_MAX_MSG_SIZE );
+ 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 */
+ vlc_va_copy( args, _args );
+ if( vasprintf( &psz_str, psz_format, args ) == -1 )
+ psz_str = NULL;
+ va_end( args );
+
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 );
- fprintf( stderr, "\n" );
+ va_end( args );
+ fputs( "\n", stderr );
+ vlc_restorecancel (canc);
return;
}
-#ifndef HAVE_VASPRINTF
-# ifdef WIN32
- psz_temp = ConvertPrintfFormatString( psz_format );
- if( !psz_temp )
- {
- fprintf( stderr, "main warning: couldn't print message\n" );
- return;
- }
- vsprintf( psz_str, psz_temp, args );
- free( psz_temp );
-# else
- vsprintf( psz_str, psz_format, args );
-# endif
-#endif
+ 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;
- /* Put message in queue */
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
- /* Check there is room in the queue for our message */
- if( ((p_this->p_vlc->msg_bank.i_stop - p_this->p_vlc->msg_bank.i_start + 1) % VLC_MSG_QSIZE) == 0 )
- {
- FlushMsg( &p_this->p_vlc->msg_bank );
- if( ((p_this->p_vlc->msg_bank.i_stop - p_this->p_vlc->msg_bank.i_start + 1) % VLC_MSG_QSIZE) == 0 )
+ i_header_size = 0;
+ p_obj = p_this;
+ while( p_obj != NULL )
+ {
+ char *psz_old = NULL;
+ if( p_obj->psz_header )
{
- fprintf( stderr, "main warning: message queue overflow\n" );
- p_item = &item;
- goto print_message;
+ i_header_size += strlen( p_obj->psz_header ) + 4;
+ if( psz_header )
+ {
+ psz_old = strdup( psz_header );
+ 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 = xmalloc( i_header_size );
+ snprintf( psz_header, i_header_size, "[%s]",
+ p_obj->psz_header );
+ }
}
+ free( psz_old );
+ p_obj = p_obj->p_parent;
}
- /* Put the message in the queue */
- p_item = p_this->p_vlc->msg_bank.msg + p_this->p_vlc->msg_bank.i_stop;
- p_this->p_vlc->msg_bank.i_stop =
- (p_this->p_vlc->msg_bank.i_stop + 1) % VLC_MSG_QSIZE;
-
/* Fill message information fields */
-print_message:
- p_item->i_type = i_type;
- p_item->i_object_id = p_this->i_object_id;
- p_item->psz_module = strdup( psz_module );
- p_item->psz_msg = psz_str;
+ p_item->i_type = i_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;
PrintMsg( p_this, p_item );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
-}
-
-/* following functions are local */
-
-/*****************************************************************************
- * FlushMsg
- *****************************************************************************
- * Print all messages remaining in queue. MESSAGE QUEUE MUST BE LOCKED, since
- * this function does not check the lock.
- *****************************************************************************/
-static void FlushMsg ( msg_bank_t *p_bank )
-{
- int i_index, i_start, i_stop;
-
- /* Get the maximum message index that can be freed */
- i_stop = p_bank->i_stop;
-
- /* Check until which value we can free messages */
- for( i_index = 0; i_index < p_bank->i_sub; i_index++ )
+ msg_bank_t *bank = &QUEUE;
+ vlc_rwlock_rdlock (&bank->lock);
+ for (int i = 0; i < bank->i_sub; i++)
{
- i_start = p_bank->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_bank->i_stop <= i_start || i_stop <= p_bank->i_stop) )
- || ( i_stop < i_start
- && (i_stop <= p_bank->i_stop && p_bank->i_stop <= i_start) ) )
- {
- i_stop = i_start;
- }
+ msg_subscription_t *sub = bank->pp_sub[i];
+ sub->func (sub->opaque, p_item, 0);
}
-
- /* Free message data */
- for( i_index = p_bank->i_start;
- 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 );
- }
-
- /* Update the new start value */
- p_bank->i_start = i_index;
+ vlc_rwlock_unlock (&bank->lock);
+ msg_Release (p_item);
}
/*****************************************************************************
- * PrintMsg: output a message item to stderr
+ * PrintMsg: output a standard message item to stderr
*****************************************************************************
* Print a message to stderr, with colour formatting if needed.
*****************************************************************************/
# define RED COL(31)
# define GREEN COL(32)
# define YELLOW COL(33)
-# define WHITE COL(37)
+# define WHITE COL(0)
# define GRAY "\033[0m"
- static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
- static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
+#ifdef UNDER_CE
+ int i_dummy;
+#endif
+ 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( priv->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_INFO:
+ if( priv->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_WARN:
+ if( priv->i_verbose < 1 ) return;
+ break;
+ case VLC_MSG_DBG:
+ if( priv->i_verbose < 2 ) return;
+ break;
+ }
+
+ 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
+ {
+ 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;
+ }
+
+#ifdef UNDER_CE
+# define CE_WRITE(str) WriteFile( QUEUE.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.logfile );
+
+#else
+ int canc = vlc_savecancel ();
/* Send the message to stderr */
- if( (i_type == VLC_MSG_ERR)
- || ( (i_type == VLC_MSG_INFO) && !p_this->p_vlc->b_quiet )
- || ( (i_type == VLC_MSG_WARN) && p_this->p_vlc->b_verbose
- && !p_this->p_vlc->b_quiet )
- || ( (i_type == VLC_MSG_DBG) && p_this->p_vlc->b_verbose
- && !p_this->p_vlc->b_quiet ) )
+ 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 )
{
- if( p_this->p_vlc->b_color )
- {
- fprintf( stderr, "[" GREEN "%.2x" GRAY ":" GREEN "%.6x" GRAY "] "
- "%s%s: %s%s" GRAY "\n", p_this->p_vlc->i_unique,
- p_item->i_object_id, p_item->psz_module,
- ppsz_type[i_type], ppsz_color[i_type],
- p_item->psz_msg );
- }
- else
- {
- fprintf( stderr, "[%.2x:%.6x] %s%s: %s\n",
- p_this->p_vlc->i_unique, p_item->i_object_id,
- p_item->psz_module, ppsz_type[i_type],
- p_item->psz_msg );
- }
+ p_ctx = malloc( sizeof( msg_context_t ) );
+ if( !p_ctx )
+ return NULL;
+ p_ctx->psz_message = NULL;
+ vlc_threadvar_set( msg_context, p_ctx );
}
+ return p_ctx;
}
-/*****************************************************************************
- * ConvertPrintfFormatString: replace all occurrences of %ll with %I64 in the
- * printf format string.
- *****************************************************************************
- * Win32 doesn't recognize the "%ll" format in a printf string, so we have
- * to convert this string to something that win32 can handle.
- * This is a REALLY UGLY HACK which won't even work in every situation,
- * but hey I don't want to put an ifdef WIN32 each time I use printf with
- * a "long long" type!!!
- * By the way, if we don't do this we can sometimes end up with segfaults.
- *****************************************************************************/
-#if defined( WIN32 )
-static char *ConvertPrintfFormatString( const char *psz_format )
+void msg_StackDestroy (void *data)
{
- int i, i_counter=0, i_pos=0;
- char *psz_dest;
-
- /* We first need to check how many occurences of %ll there are in the
- * psz_format string. Once we'll know that we'll be able to malloc the
- * destination string */
-
- if( strlen( psz_format ) <= 3 )
- return strdup( psz_format );
-
- for( i=0; i <= (strlen(psz_format) - 3); i++ )
- {
- if( !strncmp( (char *)(psz_format + i), "%ll", 3 ) )
- {
- i_counter++;
- }
- }
-
- /* malloc the destination string */
- psz_dest = malloc( strlen(psz_format) + i_counter + 1 );
- if( psz_dest == NULL )
- {
- fprintf( stderr, "main warning: ConvertPrintfFormatString failed\n" );
- return NULL;
- }
-
- /* Now build the modified string */
- i_counter = 0;
- for( i=0; i <= (strlen(psz_format) - 3); i++ )
- {
- if( !strncmp( (char *)(psz_format + i), "%ll", 3 ) )
- {
- memcpy( psz_dest+i_pos+i_counter, psz_format+i_pos, i-i_pos+1);
- *(psz_dest+i+i_counter+1)='I';
- *(psz_dest+i+i_counter+2)='6';
- *(psz_dest+i+i_counter+3)='4';
- i_pos = i+3;
- i_counter++;
- }
- }
- strcpy( psz_dest+i_pos+i_counter, psz_format+i_pos );
-
- return psz_dest;
+ 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
+ {
+ 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 );
+ }
+}
+
+const char* msg_StackMsg( void )
+{
+ msg_context_t *p_ctx = GetContext();
+ assert( p_ctx );
+ return p_ctx->psz_message;
}
-#endif
projects / vlc / blobdiff