Initialize messages stacks inside the message bank

[vlc] / src / misc / messages.c

diff --git a/src/misc/messages.c b/src/misc/messages.c
index f00a1de1ed6e32b4b786aa847d217a328384a2f4..3b5298c83648733c390cb7191add6e5fa49fbc08 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -55,6 +55,15 @@
 #include <vlc_charset.h>
 #include "../libvlc.h"
 
+typedef struct
+{
+    int i_code;
+    char * psz_message;
+} msg_context_t;
+
+static vlc_threadvar_t msg_context;
+static uintptr_t banks = 0;
+
 /*****************************************************************************
  * Local macros
  *****************************************************************************/
@@ -78,11 +87,6 @@ static void QueueMsg ( vlc_object_t *, int, const char *,
 static void FlushMsg ( msg_queue_t * );
 static void PrintMsg ( vlc_object_t *, msg_item_t * );
 
-static inline char * object_description( vlc_object_t * p_this )
-{
-    return strdup( p_this->psz_object_type );
-}
-
 /**
  * Initialize messages queues
  * This function initializes all message queues
@@ -105,6 +109,11 @@ void msg_Create (libvlc_int_t *p_libvlc)
                     CREATE_ALWAYS, 0, NULL );
     SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
 #endif
+
+    vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" );
+    if( banks++ == 0 )
+        vlc_threadvar_create( &msg_context, NULL );
+    vlc_mutex_unlock( lock );
 }
 
 /**
@@ -134,6 +143,11 @@ void msg_Destroy (libvlc_int_t *p_libvlc)
 
     FlushMsg( &QUEUE );
 
+    vlc_mutex_t *lock = var_AcquireMutex( "msg-stack" );
+    if( --banks == 0 )
+        vlc_threadvar_delete( &msg_context );
+    vlc_mutex_unlock( lock );
+
 #ifdef UNDER_CE
     CloseHandle( QUEUE.logfile );
 #endif
@@ -338,6 +352,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
 
     if( psz_str == NULL )
     {
+        int canc = vlc_savecancel (); /* Do not print half of a message... */
 #ifdef __GLIBC__
         fprintf( stderr, "main warning: can't store message (%m): " );
 #else
@@ -357,6 +372,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
         vfprintf( stderr, psz_format, args );
         va_end( args );
         fputs( "\n", stderr );
+        vlc_restorecancel (canc);
         return;
     }
 
@@ -427,7 +443,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
 
             p_item->i_type =        VLC_MSG_WARN;
             p_item->i_object_id =   p_this->i_object_id;
-            p_item->psz_object =    object_description( p_this );
+            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;
@@ -448,7 +464,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
     /* Fill message information fields */
     p_item->i_type =        i_type;
     p_item->i_object_id =   p_this->i_object_id;
-    p_item->psz_object =    object_description( p_this );
+    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;
@@ -460,7 +476,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
         free( p_item->psz_module );
         free( p_item->psz_msg );
         free( p_item->psz_header );
-        free( p_item->psz_object );
     }
 
     vlc_mutex_unlock ( &p_queue->lock );
@@ -506,7 +521,6 @@ static void FlushMsg ( msg_queue_t *p_queue )
         free( p_queue->msg[i_index].psz_msg );
         free( p_queue->msg[i_index].psz_module );
         free( p_queue->msg[i_index].psz_header );
-        free( p_queue->msg[i_index].psz_object );
     }
 
     /* Update the new start value */
@@ -552,8 +566,9 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
             break;
     }
 
-    psz_object = p_item->psz_object;
+    psz_object = p_item->psz_object_type;
 
+    int canc = vlc_savecancel ();
 #ifdef UNDER_CE
 #   define CE_WRITE(str) WriteFile( QUEUE.logfile, \
                                     str, strlen(str), &i_dummy, NULL );
@@ -606,17 +621,18 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #   if defined(WIN32)
     fflush( stderr );
 #   endif
+    vlc_restorecancel (canc);
 #endif
 }
 
 static msg_context_t* GetContext(void)
 {
-    msg_context_t *p_ctx = vlc_threadvar_get( &msg_context_global_key );
+    msg_context_t *p_ctx = vlc_threadvar_get( &msg_context );
     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 );
+        vlc_threadvar_set( &msg_context, p_ctx );
     }
     return p_ctx;
 }