* 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.11 2002/10/03 13:21:55 sam Exp $
+ * Copyright (C) 1998-2004 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
/*****************************************************************************
* 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
+
+#include <errno.h> /* errno */
+
#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
- *****************************************************************************
+/**
+ * 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 */
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
}
-/*****************************************************************************
- * msg_Flush: flush the message queue
- *****************************************************************************/
+/**
+ * Flush the message queue
+ */
void __msg_Flush( vlc_object_t *p_this )
{
int i_index;
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 )
FlushMsg( &p_this->p_libvlc->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_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;
vlc_mutex_lock( &p_bank->lock );
/* Add subscription to the list */
- p_bank->i_sub++;
- p_bank->pp_sub = realloc( p_bank->pp_sub,
- p_bank->i_sub * sizeof( msg_subscription_t* ) );
-
- p_bank->pp_sub[ p_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_bank->i_start;
p_sub->pi_stop = &p_bank->i_stop;
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;
}
/* Remove this subscription */
- for( ; i_index < (p_bank->i_sub - 1); i_index++ )
- {
- p_bank->pp_sub[ i_index ] = p_bank->pp_sub[ i_index+1 ];
- }
-
- p_bank->i_sub--;
- if( p_bank->i_sub )
- {
- p_bank->pp_sub = realloc( p_bank->pp_sub, p_bank->i_sub
- * sizeof( msg_subscription_t* ) );
- }
- else
- {
- free( p_bank->pp_sub );
- p_bank->pp_sub = NULL;
- }
+ REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index );
+ free( p_sub );
vlc_mutex_unlock( &p_bank->lock );
}
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 ); \
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 */
-#ifdef WIN32
- char * psz_temp;
-#endif
-#ifndef HAVE_VASPRINTF
+
+#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( i_size * sizeof(char) );
#endif
{
fprintf( stderr, "main warning: can't store message (%s): ",
strerror(errno) );
+ 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;
- }
- vsnprintf( psz_str, i_size, psz_temp, args );
- free( psz_temp );
-# else
+#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+ vlc_va_copy( args, _args );
vsnprintf( psz_str, i_size, psz_format, args );
-# endif
+ va_end( args );
psz_str[ i_size - 1 ] = 0; /* Just in case */
#endif
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_ERR;
+ 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" );
# 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;
- if( /*p_this->p_vlc->b_quiet ||*/ !p_this->p_libvlc->msg_bank.b_configured )
+ switch( i_type )
{
- return;
- }
-
- if( /*!p_this->p_vlc->b_verbose && */
- ( (i_type == VLC_MSG_WARN) || (i_type == VLC_MSG_DBG) ) )
- {
- return;
+ 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_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
+# 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( /*p_this->p_vlc->b_color*/1 )
+ if( p_this->p_libvlc->b_color )
{
- fprintf( stderr, "[" GREEN "%.6x" GRAY "] %s %s%s: %s%s" GRAY "\n",
+ 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, "[%.6x] %s %s%s: %s\n", p_item->i_object_id,
+ 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
+}
projects / vlc / blobdiff