X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=bfdd1d931d40d0a4dbd5a5757e9f25d3a1e88452;hb=fb7f7d22b070fbe51775f102cc66bd84b04e44b4;hp=ed17b87c8cf5c9dc23d98e8a024b95af71b04085;hpb=6673258639e376114376094236a511d03be5a95e;p=vlc

diff --git a/src/misc/messages.c b/src/misc/messages.c
index ed17b87c8c..bfdd1d931d 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -66,14 +66,14 @@
 #   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 priv->msg_bank.queue
+#define LOCK_BANK vlc_mutex_lock( &priv->msg_bank.lock );
+#define UNLOCK_BANK vlc_mutex_unlock( &priv->msg_bank.lock );
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void QueueMsg ( vlc_object_t *, int, int , const char *,
+static void QueueMsg ( vlc_object_t *, int, const char *,
                        const char *, va_list );
 static void FlushMsg ( msg_queue_t * );
 static void PrintMsg ( vlc_object_t *, msg_item_t * );
@@ -82,44 +82,35 @@ static void PrintMsg ( vlc_object_t *, msg_item_t * );
  * 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)
 {
-    int i;
-    vlc_mutex_init( (vlc_object_t *)NULL,
-                    &(p_this->p_libvlc->msg_bank.lock) );
-
-    for( i = 0; i < 2; i++ )
-    {
-         vlc_mutex_init( (vlc_object_t *)NULL, &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;
-    }
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+    vlc_mutex_init( &priv->msg_bank.lock );
+    vlc_mutex_init( &QUEUE.lock );
+    QUEUE.b_overflow = false;
+    QUEUE.i_start = 0;
+    QUEUE.i_stop = 0;
+    QUEUE.i_sub = 0;
+    QUEUE.pp_sub = 0;
 
 #ifdef UNDER_CE
-    QUEUE(MSG_QUEUE_NORMAL).logfile =
+    QUEUE.logfile =
         CreateFile( L"vlc-log.txt", GENERIC_WRITE,
                     FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
                     CREATE_ALWAYS, 0, NULL );
-    SetFilePointer( QUEUE(MSG_QUEUE_NORMAL).logfile, 0, NULL, FILE_END );
+    SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
 #endif
 }
 
 /**
  * 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++ )
-    {
-        vlc_mutex_lock( &QUEUE(i).lock );
-        FlushMsg( &QUEUE(i) );
-        vlc_mutex_unlock( &QUEUE(i).lock );
-    }
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+    vlc_mutex_lock( &QUEUE.lock );
+    FlushMsg( &QUEUE );
+    vlc_mutex_unlock( &QUEUE.lock );
 }
 
 /**
@@ -129,46 +120,45 @@ void __msg_Flush( vlc_object_t *p_this )
  * 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-- )
-    {
-        if( QUEUE(i).i_sub )
-            msg_Err( p_this, "stale interface subscribers" );
+    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
+
+    if( QUEUE.i_sub )
+        msg_Err( p_libvlc, "stale interface subscribers" );
 
-        FlushMsg( &QUEUE(i) );
+    FlushMsg( &QUEUE );
 
 #ifdef UNDER_CE
-        if( i == MSG_QUEUE_NORMAL )
-            CloseHandle( QUEUE(MSG_QUEUE_NORMAL).logfile );
+    CloseHandle( QUEUE.logfile );
 #endif
-        /* Destroy lock */
-        vlc_mutex_destroy( &QUEUE(i).lock );
-    }
-    vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) );
+    /* Destroy lock */
+    vlc_mutex_destroy( &QUEUE.lock );
+    vlc_mutex_destroy( &priv->msg_bank.lock);
 }
 
 /**
  * Subscribe to a message queue.
  */
-msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i )
+msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
 {
+    libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
     msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
 
-    assert( i < NB_QUEUES );
+    if (p_sub == NULL)
+        return NULL;
 
     LOCK_BANK;
-    vlc_mutex_lock( &QUEUE(i).lock );
+    vlc_mutex_lock( &QUEUE.lock );
 
-    TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub );
+    TAB_APPEND( QUEUE.i_sub, QUEUE.pp_sub, p_sub );
 
-    p_sub->i_start = QUEUE(i).i_start;
-    p_sub->pi_stop = &QUEUE(i).i_stop;
-    p_sub->p_msg   = QUEUE(i).msg;
-    p_sub->p_lock  = &QUEUE(i).lock;
+    p_sub->i_start = QUEUE.i_start;
+    p_sub->pi_stop = &QUEUE.i_stop;
+    p_sub->p_msg   = QUEUE.msg;
+    p_sub->p_lock  = &QUEUE.lock;
 
-    vlc_mutex_unlock( &QUEUE(i).lock );
+    vlc_mutex_unlock( &QUEUE.lock );
     UNLOCK_BANK;
 
     return p_sub;
@@ -179,22 +169,19 @@ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i )
  */
 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++ )
+    vlc_mutex_lock( &QUEUE.lock );
+    for( int j = 0 ; j< QUEUE.i_sub ; j++ )
     {
-        vlc_mutex_lock( &QUEUE(i).lock );
-        for( j = 0 ; j< QUEUE(i).i_sub ; j++ )
+        if( QUEUE.pp_sub[j] == p_sub )
         {
-            if( QUEUE(i).pp_sub[j] == p_sub )
-            {
-                REMOVE_ELEM( QUEUE(i).pp_sub, QUEUE(i).i_sub, j );
-                free( p_sub );
-            }
+            REMOVE_ELEM( QUEUE.pp_sub, QUEUE.i_sub, j );
+            free( p_sub );
         }
-        vlc_mutex_unlock( & QUEUE(i).lock );
     }
+    vlc_mutex_unlock( &QUEUE.lock );
     UNLOCK_BANK;
 }
 
@@ -203,22 +190,20 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
  *****************************************************************************
  * These functions queue a message for later printing.
  *****************************************************************************/
-void __msg_Generic( vlc_object_t *p_this, int i_queue, int i_type,
-                    const char *psz_module,
+void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
                     const char *psz_format, ... )
 {
     va_list args;
 
     va_start( args, psz_format );
-    QueueMsg( p_this, i_queue, i_type, psz_module, psz_format, args );
+    QueueMsg( p_this, i_type, psz_module, psz_format, args );
     va_end( args );
 }
 
-void __msg_GenericVa( vlc_object_t *p_this, int i_queue,
-                      int i_type, const char *psz_module,
+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_queue, i_type, psz_module, psz_format, args );
+    QueueMsg( p_this, i_type, psz_module, psz_format, args );
 }
 
 /* Generic functions used when variadic macros are not available. */
@@ -227,8 +212,7 @@ void __msg_GenericVa( vlc_object_t *p_this, int i_queue,
     { \
         va_list args; \
         va_start( args, psz_format ); \
-        QueueMsg( p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \
-                  psz_format, args ); \
+        QueueMsg( p_this, FN_TYPE, "unknown", psz_format, args ); \
         va_end( args ); \
     } \
     struct _
@@ -259,10 +243,11 @@ DECLARE_MSG_FN( __msg_Dbg,  VLC_MSG_DBG );
  * 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_queue, int i_type,
-                      const char *psz_module,
+static void QueueMsg( vlc_object_t *p_this, int i_type, 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 */
@@ -276,17 +261,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
     int          i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
 #endif
 
-    if( p_this == NULL )
-    {
-#ifndef NDEBUG
-        if( i_type == VLC_MSG_DBG )
-            return;
-#endif
-        utf8_vfprintf( stderr, psz_format, _args );
-        fputc ('\n', stderr);
-        return;
-    }
-
     if( p_this->i_flags & OBJECT_FLAGS_QUIET ||
         (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) )
         return;
@@ -414,9 +388,8 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
     psz_str[ i_size - 1 ] = 0; /* Just in case */
 #endif
 
-    assert( i_queue < NB_QUEUES );
     LOCK_BANK;
-    p_queue = &QUEUE(i_queue) ;
+    p_queue = &QUEUE;
     vlc_mutex_lock( &p_queue->lock );
 
     /* Check there is room in the queue for our message */
@@ -443,23 +416,20 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
         {
             p_queue->b_overflow = 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->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;
-
-               PrintMsg( p_this, p_item );
-               /* We print from a dummy item */
-               p_item = &item;
-            }
+            /* 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->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;
+
+            PrintMsg( p_this, p_item );
+            /* We print from a dummy item */
+            p_item = &item;
         }
     }
 
@@ -478,8 +448,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type,
     p_item->psz_msg =       psz_str;
     p_item->psz_header =    psz_header;
 
-    if( p_queue->i_id == MSG_QUEUE_NORMAL )
-        PrintMsg( p_this, p_item );
+    PrintMsg( p_this, p_item );
 
     if( p_queue->b_overflow )
     {
@@ -557,28 +526,29 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
     static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
     static const char *ppsz_color[4] = { 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( 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;
     }
 
     psz_object = p_item->psz_object_type;
 
 #ifdef UNDER_CE
-#   define CE_WRITE(str) WriteFile( QUEUE(MSG_QUEUE_NORMAL).logfile, \
+#   define CE_WRITE(str) WriteFile( QUEUE.logfile, \
                                     str, strlen(str), &i_dummy, NULL );
     CE_WRITE( p_item->psz_module );
     CE_WRITE( " " );
@@ -587,11 +557,11 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
     CE_WRITE( ": " );
     CE_WRITE( p_item->psz_msg );
     CE_WRITE( "\r\n" );
-    FlushFileBuffers( QUEUE(MSG_QUEUE_NORMAL).logfile );
+    FlushFileBuffers( QUEUE.logfile );
 
 #else
     /* Send the message to stderr */
-    if( p_this->p_libvlc->b_color )
+    if( priv->b_color )
     {
         if( p_item->psz_header )
         {
@@ -644,15 +614,24 @@ static msg_context_t* GetContext(void)
     return p_ctx;
 }
 
+void msg_StackDestroy (void *data)
+{
+    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();
-    assert( p_ctx );
 
-    va_start( ap, psz_message );
+    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 );
@@ -665,7 +644,9 @@ void msg_StackAdd( const char *psz_message, ... )
     char *psz_tmp;
     va_list ap;
     msg_context_t *p_ctx = GetContext();
-    assert( p_ctx );
+
+    if( p_ctx == NULL )
+        return;
 
     va_start( ap, psz_message );
     if( vasprintf( &psz_tmp, psz_message, ap ) == -1 )
@@ -676,14 +657,13 @@ void msg_StackAdd( const char *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 );
+        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 );
     }
 }