* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <stdio.h> /* required */
#include <stdarg.h> /* va_list for BSD */
-#include <stdlib.h> /* malloc() */
-#include <string.h> /* strerror() */
#ifdef HAVE_FCNTL_H
# include <fcntl.h> /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
#include <errno.h> /* errno */
+#ifdef WIN32
+# include <vlc_network.h> /* 'net_strerror' and 'WSAGetLastError' */
+#endif
+
#ifdef HAVE_UNISTD_H
# include <unistd.h> /* close(), write() */
#endif
#include <assert.h>
-#include "vlc_interface.h"
-#include "charset.h"
+#include <vlc_charset.h>
+#include "../libvlc.h"
/*****************************************************************************
* Local macros
# 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(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
* 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) );
-
-#define QUEUE_INIT(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;
-
- QUEUE_INIT( 0 );
- QUEUE_INIT( 1 );
-
-#undef QUEUE_INIT
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+ vlc_mutex_init( &priv->msg_bank.lock );
+
+ 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 =
/**
* 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++ )
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+
+ for( int i = 0 ; i < NB_QUEUES ; i++ )
{
vlc_mutex_lock( &QUEUE(i).lock );
FlushMsg( &QUEUE(i) );
* 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-- )
+ libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+
+ for( int i = NB_QUEUES -1 ; i >= 0; i-- )
{
if( QUEUE(i).i_sub )
- msg_Err( p_this, "stale interface subscribers" );
+ msg_Err( p_libvlc, "stale interface subscribers" );
FlushMsg( &QUEUE(i) );
/* Destroy lock */
vlc_mutex_destroy( &QUEUE(i).lock );
}
- vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) );
+ vlc_mutex_destroy( &priv->msg_bank.lock);
}
/**
*/
msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i )
{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
+ if (p_sub == NULL)
+ return NULL;
+
assert( i < NB_QUEUES );
LOCK_BANK;
*/
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++ )
+ for( int i = 0 ; i< NB_QUEUES ; i++ )
{
vlc_mutex_lock( &QUEUE(i).lock );
- for( j = 0 ; j< QUEUE(i).i_sub ; j++ )
+ for( int 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 );
+ free( p_sub );
}
}
vlc_mutex_unlock( & QUEUE(i).lock );
{ \
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 ); \
} \
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 */
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 = (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 */
+ }
+
+ /* 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 );
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;
p_obj->psz_header );
}
}
- if( psz_old ) free( psz_old );
+ free( psz_old );
p_obj = p_obj->p_parent;
}
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 )
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 )
{
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;
/* 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;
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 );
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 */
# 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
#endif
static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
- const 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;
- case VLC_OBJECT_META_ENGINE: psz_object = "meta engine"; break;
- }
+ psz_object = p_item->psz_object_type;
#ifdef UNDER_CE
# define CE_WRITE(str) WriteFile( 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 )
{
# 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;
+}
projects / vlc / blobdiff