* modules, especially intf modules. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.4 2002/07/15 19:15:05 sam Exp $
+ * $Id: messages.c,v 1.34 2003/06/24 13:33:49 sam Exp $
*
* 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
/*****************************************************************************
* 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 <vlc/vlc.h>
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h> /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */
+#endif
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* errno */
+#endif
+
#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* close(), write() */
+# include <unistd.h> /* 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
static void FlushMsg ( msg_bank_t * );
static void PrintMsg ( vlc_object_t *, msg_item_t * );
-#if defined( WIN32 )
-static char *ConvertPrintfFormatString ( const char *psz_format );
-#endif
-
/*****************************************************************************
* msg_Create: initialize messages interface
*****************************************************************************
void __msg_Create( vlc_object_t *p_this )
{
/* Message queue initialization */
- vlc_mutex_init( p_this, &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_init( p_this, &p_this->p_libvlc->msg_bank.lock );
- p_this->p_vlc->msg_bank.i_start = 0;
- p_this->p_vlc->msg_bank.i_stop = 0;
+ p_this->p_libvlc->msg_bank.b_configured = VLC_FALSE;
+ p_this->p_libvlc->msg_bank.b_overflow = VLC_FALSE;
- p_this->p_vlc->msg_bank.i_sub = 0;
- p_this->p_vlc->msg_bank.pp_sub = NULL;
+ p_this->p_libvlc->msg_bank.i_start = 0;
+ p_this->p_libvlc->msg_bank.i_stop = 0;
+
+ p_this->p_libvlc->msg_bank.i_sub = 0;
+ p_this->p_libvlc->msg_bank.pp_sub = NULL;
+
+#ifdef UNDER_CE
+ p_this->p_libvlc->msg_bank.logfile =
+ CreateFile( L"vlc-log.txt", GENERIC_WRITE,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ CREATE_ALWAYS, 0, NULL );
+ SetFilePointer( p_this->p_libvlc->msg_bank.logfile, 0, NULL, FILE_END );
+#endif
}
/*****************************************************************************
{
int i_index;
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_lock( &p_this->p_libvlc->msg_bank.lock );
- for( i_index = p_this->p_vlc->msg_bank.i_start;
- i_index != p_this->p_vlc->msg_bank.i_stop;
+ p_this->p_libvlc->msg_bank.b_configured = VLC_TRUE;
+
+ 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_vlc->msg_bank.msg[i_index] );
+ PrintMsg( p_this, &p_this->p_libvlc->msg_bank.msg[i_index] );
}
- FlushMsg( &p_this->p_vlc->msg_bank );
+ FlushMsg( &p_this->p_libvlc->msg_bank );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock );
}
/*****************************************************************************
*****************************************************************************/
void __msg_Destroy( vlc_object_t *p_this )
{
- /* Destroy lock */
- vlc_mutex_destroy( &p_this->p_vlc->msg_bank.lock );
+ if( p_this->p_libvlc->msg_bank.i_sub )
+ {
+ msg_Err( p_this, "stale interface subscribers" );
+ }
- if( p_this->p_vlc->msg_bank.i_sub )
+ /* Flush the queue */
+ if( !p_this->p_libvlc->msg_bank.b_configured )
+ {
+ msg_Flush( p_this );
+ }
+ else
{
- fprintf( stderr, "main error: stale interface subscribers\n" );
+ FlushMsg( &p_this->p_libvlc->msg_bank );
}
- /* Free remaining messages */
- FlushMsg( &p_this->p_vlc->msg_bank );
+#ifdef UNDER_CE
+ CloseHandle( p_this->p_libvlc->msg_bank.logfile );
+#endif
+
+ /* Destroy lock */
+ vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock );
}
/*****************************************************************************
*****************************************************************************/
msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
{
+ msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank;
msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_lock( &p_bank->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* ) );
-
- p_this->p_vlc->msg_bank.pp_sub[ p_this->p_vlc->msg_bank.i_sub - 1 ] = p_sub;
+ INSERT_ELEM( p_bank->pp_sub, p_bank->i_sub, p_bank->i_sub, p_sub );
- p_sub->i_start = p_this->p_vlc->msg_bank.i_start;
- p_sub->pi_stop = &p_this->p_vlc->msg_bank.i_stop;
+ p_sub->i_start = p_bank->i_start;
+ p_sub->pi_stop = &p_bank->i_stop;
- p_sub->p_msg = p_this->p_vlc->msg_bank.msg;
- p_sub->p_lock = &p_this->p_vlc->msg_bank.lock;
+ p_sub->p_msg = p_bank->msg;
+ p_sub->p_lock = &p_bank->lock;
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_unlock( &p_bank->lock );
return p_sub;
}
*****************************************************************************/
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_index;
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_lock( &p_bank->lock );
/* Sanity check */
- if( !p_this->p_vlc->msg_bank.i_sub )
+ if( !p_bank->i_sub )
{
msg_Err( p_this, "no subscriber in the list" );
return;
}
/* Look for the appropriate subscription */
- for( i_index = 0; i_index < p_this->p_vlc->msg_bank.i_sub; i_index++ )
+ for( i_index = 0; i_index < p_bank->i_sub; i_index++ )
{
- if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] == p_sub )
+ if( p_bank->pp_sub[ i_index ] == p_sub )
{
break;
}
}
- if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] != p_sub )
+ if( p_bank->pp_sub[ i_index ] != p_sub )
{
msg_Err( p_this, "subscriber not found" );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_unlock( &p_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;
- }
-
+ REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_unlock( &p_bank->lock );
}
/*****************************************************************************
QueueMsg( (vlc_object_t *)p_this, FN_TYPE, "unknown", \
psz_format, args ); \
va_end( args ); \
- }
+ } \
+ struct _
DECLARE_MSG_FN( __msg_Info, VLC_MSG_INFO );
DECLARE_MSG_FN( __msg_Err, VLC_MSG_ERR );
* 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; /* 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;
+ 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 */
+
+#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+ int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
#endif
/*
* Convert message to string
*/
-#ifdef HAVE_VASPRINTF
+#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( strlen(psz_format) + INTF_MAX_MSG_SIZE );
+ 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;
}
-#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
+#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
/* Put message in queue */
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_lock( &p_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 )
+ if( p_bank->b_overflow )
+ {
+ FlushMsg( p_bank );
+
+ if( ((p_bank->i_stop - p_bank->i_start + 1) % VLC_MSG_QSIZE) == 0 )
+ {
+ /* Still in overflow mode, print from a dummy item */
+ p_item = &item;
+ }
+ else
+ {
+ /* Pheeew, at last, there is room in the queue! */
+ p_bank->b_overflow = VLC_FALSE;
+ }
+ }
+ else if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 )
{
- FlushMsg( &p_this->p_vlc->msg_bank );
+ FlushMsg( p_bank );
- if( ((p_this->p_vlc->msg_bank.i_stop - p_this->p_vlc->msg_bank.i_start + 1) % VLC_MSG_QSIZE) == 0 )
+ if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 )
{
- fprintf( stderr, "main warning: message queue overflow\n" );
+ p_bank->b_overflow = VLC_TRUE;
+
+ /* Put the overflow message in the queue */
+ p_item = p_bank->msg + p_bank->i_stop;
+ p_bank->i_stop = (p_bank->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" );
+
+ PrintMsg( p_this, p_item );
+
+ /* We print from a dummy item */
p_item = &item;
- goto print_message;
}
}
- /* 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;
+ if( !p_bank->b_overflow )
+ {
+ /* Put the message in the queue */
+ p_item = p_bank->msg + p_bank->i_stop;
+ p_bank->i_stop = (p_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 = p_this->i_object_id;
+ p_item->i_object_type = p_this->i_object_type;
+ p_item->psz_module = strdup( psz_module );
+ p_item->psz_msg = psz_str;
PrintMsg( p_this, p_item );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ if( p_bank->b_overflow )
+ {
+ free( p_item->psz_module );
+ free( p_item->psz_msg );
+ }
+
+ vlc_mutex_unlock( &p_bank->lock );
}
/* following functions are local */
{
int i_index, i_start, i_stop;
+ /* Only flush the queue if it has been properly configured */
+ if( !p_bank->b_configured )
+ {
+ return;
+ }
+
/* Get the maximum message index that can be freed */
i_stop = p_bank->i_stop;
# define WHITE COL(37)
# define GRAY "\033[0m"
+#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 };
+ char *psz_object = "private";
int i_type = p_item->i_type;
+ switch( i_type )
+ {
+ case VLC_MSG_ERR:
+ if( p_this->p_libvlc->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_INFO:
+ if( p_this->p_libvlc->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_WARN:
+ if( p_this->p_libvlc->i_verbose < 1 ) return;
+ break;
+ case VLC_MSG_DBG:
+ if( p_this->p_libvlc->i_verbose < 2 ) return;
+ break;
+ }
+
+ switch( p_item->i_object_type )
+ {
+ case VLC_OBJECT_ROOT: psz_object = "root"; break;
+ case VLC_OBJECT_VLC: psz_object = "vlc"; 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_VOUT: psz_object = "video output"; break;
+ case VLC_OBJECT_AOUT: psz_object = "audio output"; break;
+ case VLC_OBJECT_SOUT: psz_object = "stream output"; break;
+ }
+
+#ifdef UNDER_CE
+# define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.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( p_this->p_libvlc->msg_bank.logfile );
+
+#else
/* 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 ) )
+ if( p_this->p_libvlc->b_color )
{
- 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 );
- }
+ fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s%s: %s%s" GRAY "\n",
+ p_item->i_object_id, p_item->psz_module, psz_object,
+ ppsz_type[i_type], ppsz_color[i_type],
+ p_item->psz_msg );
+ }
+ else
+ {
+ fprintf( stderr, "[%.8i] %s %s%s: %s\n", p_item->i_object_id,
+ p_item->psz_module, psz_object, ppsz_type[i_type],
+ p_item->psz_msg );
}
-}
-/*****************************************************************************
- * 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 )
-{
- 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;
-}
+# if defined(WIN32)
+ fflush( stderr );
+# endif
#endif
+}