Add facilities to report and enrich error messages.

[vlc] / include / vlc_threads_funcs.h

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index d77d804a30dd256f5ef02b6fc237959d57250949..c81713689fc0bb99f878d2f19ed6e2f6bd5fbd2a 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -25,6 +25,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
+#ifndef _VLC_THREADFUNCS_H_
+#define _VLC_THREADFUNCS_H_
+
 /*****************************************************************************
  * Function definitions
  *****************************************************************************/
@@ -34,6 +41,7 @@ VLC_EXPORT( int,  __vlc_mutex_init,    ( vlc_object_t *, vlc_mutex_t * ) );
 VLC_EXPORT( int,  __vlc_mutex_destroy, ( const char *, int, vlc_mutex_t * ) );
 VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_object_t *, vlc_cond_t * ) );
 VLC_EXPORT( int,  __vlc_cond_destroy,  ( const char *, int, vlc_cond_t * ) );
+VLC_EXPORT( int, __vlc_threadvar_create, (vlc_object_t *, vlc_threadvar_t * ) );
 VLC_EXPORT( int,  __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( void * ), int, vlc_bool_t ) );
 VLC_EXPORT( int,  __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) );
 VLC_EXPORT( void, __vlc_thread_ready,  ( vlc_object_t * ) );
@@ -503,9 +511,8 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
 
     if( i_result == ETIMEDOUT )
     {
-        /* People keep pissing me off with this. --Meuuh */
         msg_Dbg( p_condvar->p_this,
-                  "thread %li: secret message triggered "
+                  "thread %li: possible condition deadlock "
                   "at %s:%d (%s)", CAST_PTHREAD_TO_INT(pthread_self()),
                   psz_file, i_line, strerror(i_result) );
 
@@ -544,6 +551,68 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
 #define vlc_cond_destroy( P_COND )                                          \
     __vlc_cond_destroy( __FILE__, __LINE__, P_COND )
 
+/*****************************************************************************
+ * vlc_threadvar_create: create a thread-local variable
+ *****************************************************************************/
+#define vlc_threadvar_create( PTHIS, P_TLS )                                 \
+   __vlc_threadvar_create( PTHIS, P_TLS )
+
+/*****************************************************************************
+ * vlc_threadvar_set: create: set the value of a thread-local variable
+ *****************************************************************************/
+static inline int vlc_threadvar_set( vlc_threadvar_t * p_tls, void *p_value )
+{
+    int i_ret;
+
+#if defined( PTH_INIT_IN_PTH_H )
+    return pth_key_setdata( p_tls->handle, p_value );
+#elif  defined( ST_INIT_IN_ST_H )
+    return st_thread_setspecific( p_tls->handle, p_value );
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+    return -1;
+
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    i_ret = ( TlsSetValue( p_tls->handle, p_value ) != 0 );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_ret = pthread_setspecific( p_tls->handle, p_value );
+
+#elif defined( HAVE_CTHREADS_H )
+    i_ret = cthread_setspecific( p_tls->handle, p_value );
+#endif
+
+    return i_ret;
+}
+
+/*****************************************************************************
+ * vlc_threadvar_get: create: get the value of a thread-local variable
+ *****************************************************************************/
+static inline void* vlc_threadvar_get( vlc_threadvar_t * p_tls )
+{
+    void* p_ret;
+
+#if defined( PTH_INIT_IN_PTH_H )
+    p_ret = pth_key_getdata( p_handle->key );
+#elif defined( ST_INIT_IN_ST_H )
+    p_ret = st_thread_getspecific( p_handle->key );
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+    p_ret = NULL;
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    p_ret = TlsGetValue( p_tls->handle );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    p_ret = pthread_getspecific( p_tls->handle );
+
+#elif defined( HAVE_CTHREADS_H )
+    if ( !cthread_getspecific( p_tls->handle, &p_ret ) )
+    {
+        p_ret = NULL;
+    }
+#endif
+
+    return p_ret;
+}
+
 /*****************************************************************************
  * vlc_thread_create: create a thread
  *****************************************************************************/
@@ -567,3 +636,5 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
  *****************************************************************************/
 #define vlc_thread_join( P_THIS )                                           \
     __vlc_thread_join( VLC_OBJECT(P_THIS), __FILE__, __LINE__ )
+
+#endif