void msg_Destroy (libvlc_int_t *);
/** Internal message stack context */
-typedef struct
-{
- int i_code;
- char * psz_message;
-} msg_context_t;
-
void msg_StackSet ( int, const char*, ... );
void msg_StackAdd ( const char*, ... );
const char* msg_StackMsg ( void );
-/** The global thread var for msg stack context
- * We store this as a static global variable so we don't need a vlc_object_t
- * everywhere.
- * This key is created in vlc_threads_init and is therefore ready to use at
- * the very beginning of the universe */
-extern vlc_threadvar_t msg_context_global_key;
void msg_StackDestroy (void *);
/*
#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
*****************************************************************************/
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 );
}
/**
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
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;
}
return p_root;
}
-vlc_threadvar_t msg_context_global_key;
-
#if defined(LIBVLC_USE_PTHREAD)
static inline unsigned long vlc_threadid (void)
{
}
/* We should be safe now. Do all the initialization stuff we want. */
- vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy );
#ifndef LIBVLC_USE_PTHREAD_CANCEL
vlc_threadvar_create( &cancel_key, free );
#endif
#ifndef LIBVLC_USE_PTHREAD
vlc_threadvar_delete( &cancel_key );
#endif
- vlc_threadvar_delete( &msg_context_global_key );
}
i_initializations--;