* 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.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 <vlc/vlc.h>
+
#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_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"
+#include "charset.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 QueueMsg ( vlc_object_t *, int , const char *,
+static void QueueMsg ( vlc_object_t *, int, int , const char *,
const char *, va_list );
-static void FlushMsg ( msg_bank_t * );
+static void FlushMsg ( msg_queue_t * );
static void PrintMsg ( vlc_object_t *, msg_item_t * );
+static void CreateMsgQueue( vlc_object_t *p_this, int i_queue );
-#if defined( WIN32 )
-static char *ConvertPrintfFormatString ( const char *psz_format );
+/**
+ * Initialize messages queues
+ * This function initializes all message queues
+ */
+void __msg_Create( vlc_object_t *p_this )
+{
+ vlc_mutex_init( p_this, &(p_this->p_libvlc_global->msg_bank.lock) );
+
+ CreateMsgQueue( p_this, MSG_QUEUE_NORMAL );
+ CreateMsgQueue( p_this, MSG_QUEUE_HTTPD_ACCESS );
+
+#ifdef UNDER_CE
+ p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile =
+ CreateFile( L"vlc-log.txt", GENERIC_WRITE,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ CREATE_ALWAYS, 0, NULL );
+ SetFilePointer( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->
+ logfile, 0, NULL, FILE_END );
#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 )
+}
+
+static void CreateMsgQueue( vlc_object_t *p_this, int i_queue )
{
- /* Message queue initialization */
- vlc_mutex_init( p_this, &p_this->p_vlc->msg_bank.lock );
+ msg_queue_t *p_queue = (msg_queue_t *)malloc( sizeof( msg_queue_t ) );
+
+ vlc_mutex_init( p_this, &p_queue->lock );
- p_this->p_vlc->msg_bank.i_start = 0;
- p_this->p_vlc->msg_bank.i_stop = 0;
+ p_queue->b_overflow = VLC_FALSE;
+ p_queue->i_id = i_queue;
+ p_queue->i_start = 0;
+ p_queue->i_stop = 0;
- p_this->p_vlc->msg_bank.i_sub = 0;
- p_this->p_vlc->msg_bank.pp_sub = NULL;
+ p_queue->i_sub = 0;
+ p_queue->pp_sub = NULL;
+
+ INSERT_ELEM( p_this->p_libvlc_global->msg_bank.pp_queues,
+ p_this->p_libvlc_global->msg_bank.i_queues,
+ i_queue,
+ p_queue );
}
-/*****************************************************************************
- * msg_Flush: flush the message queue
- *****************************************************************************/
+/**
+ * Flush all message queues
+ */
void __msg_Flush( vlc_object_t *p_this )
{
- int i_index;
-
- vlc_mutex_lock( &p_this->p_vlc->msg_bank.lock );
+ int i;
- 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 )
+ for( i = 0 ; i < p_this->p_libvlc_global->msg_bank.i_queues; i++ )
{
- PrintMsg( p_this, &p_this->p_vlc->msg_bank.msg[i_index] );
+ vlc_mutex_lock( &p_this->p_libvlc_global->msg_bank.pp_queues[i]->lock );
+ FlushMsg( p_this->p_libvlc_global->msg_bank.pp_queues[i] );
+ vlc_mutex_unlock( &p_this->p_libvlc_global->msg_bank.pp_queues[i]->lock );
}
-
- FlushMsg( &p_this->p_vlc->msg_bank );
-
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
}
-/*****************************************************************************
- * 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.
+/**
+ * Free resources allocated by msg_Create
+ *
+ * This functions prints all messages remaining in the normal queue,
+ * 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 )
{
- /* Destroy lock */
- vlc_mutex_destroy( &p_this->p_vlc->msg_bank.lock );
-
- if( p_this->p_vlc->msg_bank.i_sub )
+ int i;
+ for( i = p_this->p_libvlc_global->msg_bank.i_queues -1 ; i >= 0; i-- )
{
- fprintf( stderr, "main error: stale interface subscribers\n" );
- }
+ msg_queue_t *p_queue = p_this->p_libvlc_global->msg_bank.pp_queues[i];
+ if( p_queue->i_sub )
+ {
+ msg_Err( p_this, "stale interface subscribers" );
+ }
+ FlushMsg( p_queue );
- /* Free remaining messages */
- FlushMsg( &p_this->p_vlc->msg_bank );
+#ifdef UNDER_CE
+ if( i == MSG_QUEUE_NORMAL )
+ CloseHandle( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile );
+#endif
+ /* Destroy lock */
+ vlc_mutex_destroy( &p_queue->lock );
+ REMOVE_ELEM( p_this->p_libvlc_global->msg_bank.pp_queues,
+ p_this->p_libvlc_global->msg_bank.i_queues, i );
+ free( p_queue );
+ }
+ vlc_mutex_destroy( &(p_this->p_libvlc_global->msg_bank.lock) );
}
-/*****************************************************************************
- * msg_Subscribe: subscribe to the message queue.
- *****************************************************************************/
-msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
+/**
+ * Subscribe to the message queue.
+ */
+msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i_queue )
{
+ msg_bank_t *p_bank = &p_this->p_libvlc_global->msg_bank;
msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
+ msg_queue_t *p_queue = NULL;
+ int i;
- 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* ) );
+ for( i = 0 ; i <p_bank->i_queues ;i++ )
+ {
+ if( p_bank->pp_queues[i]->i_id == i_queue )
+ {
+ p_queue = p_bank->pp_queues[i];
+ }
+ }
- p_this->p_vlc->msg_bank.pp_sub[ p_this->p_vlc->msg_bank.i_sub - 1 ] = p_sub;
+ if( p_queue == NULL )
+ {
+ vlc_mutex_unlock( &p_bank->lock );
+ return NULL;
+ }
- 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( &p_queue->lock );
+
+ /* Add subscription to the list */
+ INSERT_ELEM( p_bank->pp_queues[i_queue]->pp_sub,
+ p_bank->pp_queues[i_queue]->i_sub,
+ p_bank->pp_queues[i_queue]->i_sub,
+ p_sub );
- p_sub->p_msg = p_this->p_vlc->msg_bank.msg;
- p_sub->p_lock = &p_this->p_vlc->msg_bank.lock;
+ p_sub->i_start = p_queue->i_start;
+ p_sub->pi_stop = &p_queue->i_stop;
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ p_sub->p_msg = p_queue->msg;
+ p_sub->p_lock = &p_queue->lock;
+
+ vlc_mutex_unlock( &p_queue->lock );
+ vlc_mutex_unlock( &p_bank->lock );
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 )
{
- int i_index;
+ msg_bank_t *p_bank = &p_this->p_libvlc_global->msg_bank;
+ int i,j;
- 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 )
+ for( i = 0 ; i< p_bank->i_queues ; i++ )
{
- 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++ )
- {
- if( p_this->p_vlc->msg_bank.pp_sub[ i_index ] == p_sub )
+ vlc_mutex_lock( & p_bank->pp_queues[i]->lock );
+ for( j = 0 ; j< p_bank->pp_queues[i]->i_sub ; j++ )
{
- break;
+ if( p_bank->pp_queues[i]->pp_sub[j] == p_sub )
+ {
+ REMOVE_ELEM( p_bank->pp_queues[i]->pp_sub,
+ p_bank->pp_queues[i]->i_sub,
+ j );
+ if( p_sub ) free( p_sub );
+ }
}
+ vlc_mutex_unlock( & p_bank->pp_queues[i]->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;
- }
-
-
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ vlc_mutex_unlock( &p_bank->lock );
}
/*****************************************************************************
*****************************************************************************
* These functions queue a message for later printing.
*****************************************************************************/
-void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
+void __msg_Generic( vlc_object_t *p_this, int i_queue_id, int i_type,
+ const char *psz_module,
const char *psz_format, ... )
{
va_list args;
va_start( args, psz_format );
- QueueMsg( p_this, i_type, psz_module, psz_format, args );
+ QueueMsg( p_this, i_queue_id, i_type, psz_module, psz_format, args );
va_end( args );
}
+void __msg_GenericVa( vlc_object_t *p_this, int i_queue_id,
+ int i_type, const char *psz_module,
+ const char *psz_format, va_list args )
+{
+ QueueMsg( p_this, i_queue_id, 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 ); \
- QueueMsg( (vlc_object_t *)p_this, FN_TYPE, "unknown", \
+ QueueMsg( (vlc_object_t *)p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \
psz_format, args ); \
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 )
+ */
+static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type,
+ const char *psz_module,
+ 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;
+ int i_header_size; /* Size of the additionnal header */
+ vlc_object_t *p_obj;
+ msg_bank_t *p_bank; /* message bank */
+ msg_queue_t *p_queue = NULL;
+ char * psz_str = NULL; /* formatted message string */
+ char * psz_header = NULL;
+ 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(__APPLE__) || defined(SYS_BEOS)
+ int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
#endif
+ int i;
+
+ if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET ||
+ (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) )
+ {
+ return;
+ }
+
+ p_bank = &p_this->p_libvlc_global->msg_bank;
/*
* Convert message to string
*/
-#ifdef HAVE_VASPRINTF
+#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !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 )
{
fprintf( stderr, "main warning: can't store message (%s): ",
strerror(errno) );
+ 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 );
return;
}
-#ifndef HAVE_VASPRINTF
-# ifdef WIN32
- psz_temp = ConvertPrintfFormatString( psz_format );
- if( !psz_temp )
+ i_header_size = 0;
+ p_obj = p_this;
+ while( p_obj != NULL )
{
- fprintf( stderr, "main warning: couldn't print message\n" );
- return;
+ char *psz_old = NULL;
+ if( p_obj == NULL ) break;
+ if( p_obj->psz_header )
+ {
+ i_header_size += strlen( p_obj->psz_header ) + 4;
+ if( psz_header )
+ {
+ psz_old = strdup( psz_header );
+ psz_header = (char*)realloc( psz_header, i_header_size );
+ snprintf( psz_header, i_header_size , "[%s] %s",
+ p_obj->psz_header, psz_old );
+ }
+ else
+ {
+ psz_header = (char *)malloc( i_header_size );
+ snprintf( psz_header, i_header_size, "[%s]",
+ p_obj->psz_header );
+ }
+ }
+ if( psz_old ) free( psz_old );
+ p_obj = p_obj->p_parent;
}
- vsprintf( psz_str, psz_temp, args );
- free( psz_temp );
-# else
- vsprintf( psz_str, psz_format, args );
-# endif
+
+#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || 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 );
+ for( i = 0 ; i <p_bank->i_queues ;i++ )
+ {
+ if( p_bank->pp_queues[i]->i_id == i_queue_id )
+ {
+ p_queue = p_bank->pp_queues[i];
+ }
+ }
+
+ if( p_queue == NULL )
+ {
+ vlc_mutex_unlock( &p_bank->lock );
+ if( psz_str ) free( psz_str );
+ if( psz_header ) free( psz_header );
+ return;
+ }
+
+ vlc_mutex_lock( &p_queue->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_queue->b_overflow )
{
- FlushMsg( &p_this->p_vlc->msg_bank );
+ FlushMsg( p_queue );
- if( ((p_this->p_vlc->msg_bank.i_stop - p_this->p_vlc->msg_bank.i_start + 1) % VLC_MSG_QSIZE) == 0 )
+ if( ((p_queue->i_stop - p_queue->i_start + 1) % VLC_MSG_QSIZE) == 0 )
{
- fprintf( stderr, "main warning: message queue overflow\n" );
+ /* Still in overflow mode, print from a dummy item */
p_item = &item;
- goto print_message;
+ }
+ else
+ {
+ /* Pheeew, at last, there is room in the queue! */
+ p_queue->b_overflow = VLC_FALSE;
+ }
+ }
+ else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 )
+ {
+ FlushMsg( p_queue );
+
+ if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 )
+ {
+ p_queue->b_overflow = VLC_TRUE;
+
+ if( p_queue->i_id == MSG_QUEUE_NORMAL )
+ {
+ /* Put the overflow message in the queue */
+ p_item = p_queue->msg + p_queue->i_stop;
+ p_queue->i_stop = (p_queue->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" );
+ p_item->psz_header = NULL;
+
+ PrintMsg( p_this, p_item );
+ /* We print from a dummy item */
+ p_item = &item;
+ }
}
}
- /* 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_queue->b_overflow )
+ {
+ /* Put the message in the queue */
+ p_item = p_queue->msg + p_queue->i_stop;
+ p_queue->i_stop = (p_queue->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;
+ p_item->psz_header = psz_header;
- PrintMsg( p_this, p_item );
+ if( p_queue->i_id == MSG_QUEUE_NORMAL )
+ PrintMsg( p_this, p_item );
- vlc_mutex_unlock( &p_this->p_vlc->msg_bank.lock );
+ 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 );
+ }
+
+ vlc_mutex_unlock ( &p_queue->lock );
+ vlc_mutex_unlock( &p_bank->lock );
}
/* following functions are local */
* 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 )
+static void FlushMsg ( msg_queue_t *p_queue )
{
int i_index, i_start, i_stop;
/* Get the maximum message index that can be freed */
- i_stop = p_bank->i_stop;
+ i_stop = p_queue->i_stop;
/* Check until which value we can free messages */
- for( i_index = 0; i_index < p_bank->i_sub; i_index++ )
+ for( i_index = 0; i_index < p_queue->i_sub; i_index++ )
{
- i_start = p_bank->pp_sub[ i_index ]->i_start;
+ i_start = p_queue->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) )
+ && (p_queue->i_stop <= i_start || i_stop <= p_queue->i_stop) )
|| ( i_stop < i_start
- && (i_stop <= p_bank->i_stop && p_bank->i_stop <= i_start) ) )
+ && (i_stop <= p_queue->i_stop && p_queue->i_stop <= i_start) ) )
{
i_stop = i_start;
}
}
/* Free message data */
- for( i_index = p_bank->i_start;
+ for( i_index = p_queue->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 );
+ 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 );
}
/* Update the new start value */
- p_bank->i_start = i_index;
+ p_queue->i_start = i_index;
}
/*****************************************************************************
- * 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 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_global->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_INFO:
+ if( p_this->p_libvlc_global->i_verbose < 0 ) return;
+ break;
+ case VLC_MSG_WARN:
+ if( p_this->p_libvlc_global->i_verbose < 1 ) return;
+ break;
+ case VLC_MSG_DBG:
+ if( p_this->p_libvlc_global->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;
+ }
+
+#ifdef UNDER_CE
+# define CE_WRITE(str) WriteFile( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->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_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->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_global->b_color )
{
- if( p_this->p_vlc->b_color )
+ if( p_item->psz_header )
{
- 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 );
+ utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s %s%s: %s%s" GRAY
+ "\n",
+ p_item->i_object_id, p_item->psz_header,
+ p_item->psz_module, psz_object,
+ 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 );
+ utf8_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
+ {
+ if( p_item->psz_header )
+ {
+ utf8_fprintf( stderr, "[%.8i] %s %s %s%s: %s\n", p_item->i_object_id,
+ p_item->psz_header, p_item->psz_module,
+ psz_object, ppsz_type[i_type], p_item->psz_msg );
+ }
+ else
+ {
+ utf8_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