]> git.sesse.net Git - vlc/blobdiff - include/vlc_threads_funcs.h
new (failing) test for media list player (ticket #1524)
[vlc] / include / vlc_threads_funcs.h
index 311b7451649c56f3238dff69c43abba2a762d3c2..7add0dcc66cd69b45675e45ee751c35fafc76607 100644 (file)
@@ -2,7 +2,7 @@
  * vlc_threads_funcs.h : threads implementation for the VideoLAN client
  * This header provides a portable threads implementation.
  *****************************************************************************
- * Copyright (C) 1999, 2002 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  * 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_
+
+#if defined( WIN32 ) && !defined ETIMEDOUT
+#  define ETIMEDOUT 10060 /* This is the value in winsock.h. */
+#endif
+
 /*****************************************************************************
  * Function definitions
  *****************************************************************************/
-VLC_EXPORT( int,  __vlc_threads_init,  ( vlc_object_t * ) );
-VLC_EXPORT( int,  __vlc_threads_end,   ( vlc_object_t * ) );
-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_mutex_init,    ( vlc_mutex_t * ) );
+VLC_EXPORT( int,  __vlc_mutex_init_recursive, ( vlc_mutex_t * ) );
+VLC_EXPORT( void,  __vlc_mutex_destroy, ( const char *, int, vlc_mutex_t * ) );
+VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_cond_t * ) );
+VLC_EXPORT( void,  __vlc_cond_destroy,  ( const char *, int, vlc_cond_t * ) );
+VLC_EXPORT( int, __vlc_threadvar_create, (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 * ) );
 VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
 
-
 /*****************************************************************************
  * vlc_threads_init: initialize threads system
  *****************************************************************************/
@@ -56,7 +66,13 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
  * vlc_mutex_init: initialize a mutex
  *****************************************************************************/
 #define vlc_mutex_init( P_THIS, P_MUTEX )                                   \
-    __vlc_mutex_init( VLC_OBJECT(P_THIS), P_MUTEX )
+    __vlc_mutex_init( P_MUTEX )
+
+/*****************************************************************************
+ * vlc_mutex_init: initialize a recursive mutex (Don't use it)
+ *****************************************************************************/
+#define vlc_mutex_init_recursive( P_THIS, P_MUTEX )                         \
+    __vlc_mutex_init_recursive( P_MUTEX )
 
 /*****************************************************************************
  * vlc_mutex_lock: lock a mutex
@@ -64,150 +80,78 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
 #define vlc_mutex_lock( P_MUTEX )                                           \
     __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
 
-#ifdef __APPLE__
-#   define CAST_PTHREAD_TO_INT(t) (unsigned long int)(uintptr_t)(void *)t
+#if defined(LIBVLC_USE_PTHREAD)
+VLC_EXPORT(void, vlc_pthread_fatal, (const char *action, int error, const char *file, unsigned line));
+
+# define VLC_THREAD_ASSERT( action ) \
+    if (val) \
+        vlc_pthread_fatal (action, val, psz_file, i_line)
 #else
-#   define CAST_PTHREAD_TO_INT(t) (unsigned long int)t
+# define VLC_THREAD_ASSERT (void)0
 #endif
 
-static inline int __vlc_mutex_lock( const char * psz_file, int i_line,
+static inline void __vlc_mutex_lock( const char * psz_file, int i_line,
                                     vlc_mutex_t * p_mutex )
 {
-    int i_result;
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
-    i_result = ( pth_mutex_acquire( &p_mutex->mutex, FALSE, NULL ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
-    i_result = st_mutex_lock( p_mutex->mutex );
+#if defined( UNDER_CE )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
 
-#elif defined( UNDER_CE )
     EnterCriticalSection( &p_mutex->csection );
-    i_result = 0;
 
 #elif defined( WIN32 )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
     if( p_mutex->mutex )
-    {
         WaitForSingleObject( p_mutex->mutex, INFINITE );
-    }
     else
-    {
         EnterCriticalSection( &p_mutex->csection );
-    }
-    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
-    if( p_mutex == NULL )
-    {
-        i_result = B_BAD_VALUE;
-    }
-    else if( p_mutex->init < 2000 )
-    {
-        i_result = B_NO_INIT;
-    }
-    else
-    {
-        i_result = acquire_sem( p_mutex->lock );
-    }
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_mutex_lock( &p_mutex->mutex );
-    if ( i_result )
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
-    }
+    acquire_sem( p_mutex->lock );
 
-#elif defined( HAVE_CTHREADS_H )
-    mutex_lock( p_mutex->mutex );
-    i_result = 0;
+#elif defined(LIBVLC_USE_PTHREAD)
+#   define vlc_assert_locked( m ) \
+           assert (pthread_mutex_lock (&((m)->mutex)) == EDEADLK)
+    int val = pthread_mutex_lock( &p_mutex->mutex );
+    VLC_THREAD_ASSERT ("locking mutex");
 
 #endif
-
-    if( i_result )
-    {
-        msg_Err( p_mutex->p_this,
-                 "thread %li: mutex_lock failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
-    }
-    return i_result;
 }
 
+#ifndef vlc_assert_locked
+# define vlc_assert_locked( m ) (void)0
+#endif
+
 /*****************************************************************************
  * vlc_mutex_unlock: unlock a mutex
  *****************************************************************************/
 #define vlc_mutex_unlock( P_MUTEX )                                         \
     __vlc_mutex_unlock( __FILE__, __LINE__, P_MUTEX )
 
-static inline int __vlc_mutex_unlock( const char * psz_file, int i_line,
+static inline void __vlc_mutex_unlock( const char * psz_file, int i_line,
                                       vlc_mutex_t *p_mutex )
 {
-    int i_result;
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
-    i_result = ( pth_mutex_release( &p_mutex->mutex ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
-    i_result = st_mutex_unlock( p_mutex->mutex );
+#if defined( UNDER_CE )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
 
-#elif defined( UNDER_CE )
     LeaveCriticalSection( &p_mutex->csection );
-    i_result = 0;
 
 #elif defined( WIN32 )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
     if( p_mutex->mutex )
-    {
         ReleaseMutex( p_mutex->mutex );
-    }
     else
-    {
         LeaveCriticalSection( &p_mutex->csection );
-    }
-    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
-    if( p_mutex == NULL )
-    {
-        i_result = B_BAD_VALUE;
-    }
-    else if( p_mutex->init < 2000 )
-    {
-        i_result = B_NO_INIT;
-    }
-    else
-    {
-        release_sem( p_mutex->lock );
-        return B_OK;
-    }
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_mutex_unlock( &p_mutex->mutex );
-    if ( i_result )
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
-    }
+    release_sem( p_mutex->lock );
 
-#elif defined( HAVE_CTHREADS_H )
-    mutex_unlock( p_mutex );
-    i_result = 0;
+#elif defined(LIBVLC_USE_PTHREAD)
+    int val = pthread_mutex_unlock( &p_mutex->mutex );
+    VLC_THREAD_ASSERT ("unlocking mutex");
 
 #endif
-
-    if( i_result )
-    {
-        msg_Err( p_mutex->p_this,
-                 "thread %li: mutex_unlock failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
-    }
-
-    return i_result;
 }
 
 /*****************************************************************************
@@ -220,7 +164,7 @@ static inline int __vlc_mutex_unlock( const char * psz_file, int i_line,
  * vlc_cond_init: initialize a condition
  *****************************************************************************/
 #define vlc_cond_init( P_THIS, P_COND )                                     \
-    __vlc_cond_init( VLC_OBJECT(P_THIS), P_COND )
+    __vlc_cond_init( P_COND )
 
 /*****************************************************************************
  * vlc_cond_signal: start a thread on condition completion
@@ -228,30 +172,25 @@ static inline int __vlc_mutex_unlock( const char * psz_file, int i_line,
 #define vlc_cond_signal( P_COND )                                           \
     __vlc_cond_signal( __FILE__, __LINE__, P_COND )
 
-static inline int __vlc_cond_signal( const char * psz_file, int i_line,
-                                     vlc_cond_t *p_condvar )
+static inline void __vlc_cond_signal( const char * psz_file, int i_line,
+                                      vlc_cond_t *p_condvar )
 {
-    int i_result;
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
+#if defined( UNDER_CE )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
 
-#if defined( PTH_INIT_IN_PTH_H )
-    i_result = ( pth_cond_notify( &p_condvar->cond, FALSE ) == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
-    i_result = st_cond_signal( p_condvar->cond );
-
-#elif defined( UNDER_CE )
     PulseEvent( p_condvar->event );
-    i_result = 0;
 
 #elif defined( WIN32 )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
     /* Release one waiting thread if one is available. */
     /* For this trick to work properly, the vlc_cond_signal must be surrounded
      * by a mutex. This will prevent another thread from stealing the signal */
     if( !p_condvar->semaphore )
     {
+        /* PulseEvent() only works if none of the waiting threads is suspended.
+         * This is particularily problematic under a debug session.
+         * as documented in http://support.microsoft.com/kb/q173260/ */
         PulseEvent( p_condvar->event );
     }
     else if( p_condvar->i_win9x_cv == 1 )
@@ -285,71 +224,34 @@ static inline int __vlc_cond_signal( const char * psz_file, int i_line,
             WaitForSingleObject( p_condvar->event, INFINITE );
         }
     }
-    i_result = 0;
 
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
-    if( p_condvar == NULL )
-    {
-        i_result = B_BAD_VALUE;
-    }
-    else if( p_condvar->init < 2000 )
-    {
-        i_result = B_NO_INIT;
-    }
-    else
+    while( p_condvar->thread != -1 )
     {
-        while( p_condvar->thread != -1 )
+        thread_info info;
+        if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE )
+            return;
+
+        if( info.state != B_THREAD_SUSPENDED )
+        {
+            /* The  waiting thread is not suspended so it could
+             * have been interrupted beetwen the unlock and the
+             * suspend_thread line. That is why we sleep a little
+             * before retesting p_condver->thread. */
+            snooze( 10000 );
+        }
+        else
         {
-            thread_info info;
-            if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE )
-            {
-                return 0;
-            }
-
-            if( info.state != B_THREAD_SUSPENDED )
-            {
-                /* The  waiting thread is not suspended so it could
-                 * have been interrupted beetwen the unlock and the
-                 * suspend_thread line. That is why we sleep a little
-                 * before retesting p_condver->thread. */
-                snooze( 10000 );
-            }
-            else
-            {
-                /* Ok, we have to wake up that thread */
-                resume_thread( p_condvar->thread );
-                return 0;
-            }
+            /* Ok, we have to wake up that thread */
+            resume_thread( p_condvar->thread );
         }
-        i_result = 0;
     }
 
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_result = pthread_cond_signal( &p_condvar->cond );
-    if ( i_result )
-    {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
-    }
-
-#elif defined( HAVE_CTHREADS_H )
-    /* condition_signal() */
-    if ( p_condvar->queue.head || p_condvar->implications )
-    {
-        cond_signal( (condition_t)p_condvar );
-    }
-    i_result = 0;
+#elif defined(LIBVLC_USE_PTHREAD)
+    int val = pthread_cond_signal( &p_condvar->cond );
+    VLC_THREAD_ASSERT ("signaling condition variable");
 
 #endif
-
-    if( i_result )
-    {
-        msg_Err( p_condvar->p_this,
-                 "thread %li: cond_signal failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
-    }
-
-    return i_result;
 }
 
 /*****************************************************************************
@@ -358,24 +260,10 @@ static inline int __vlc_cond_signal( const char * psz_file, int i_line,
 #define vlc_cond_wait( P_COND, P_MUTEX )                                     \
     __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX  )
 
-static inline int __vlc_cond_wait( const char * psz_file, int i_line,
-                                   vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex )
+static inline void __vlc_cond_wait( const char * psz_file, int i_line,
+                                    vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex )
 {
-    int i_result;
-    /* In case of error : */
-    unsigned long int i_thread = 0;
-    const char * psz_error = "";
-
-#if defined( PTH_INIT_IN_PTH_H )
-    i_result = ( pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL )
-                 == FALSE );
-
-#elif defined( ST_INIT_IN_ST_H )
-    st_mutex_unlock( p_mutex->mutex );
-    i_result = st_cond_wait( p_condvar->cond );
-    st_mutex_lock( p_mutex->mutex );
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
     p_condvar->i_waiting_threads++;
     LeaveCriticalSection( &p_mutex->csection );
     WaitForSingleObject( p_condvar->event, INFINITE );
@@ -384,9 +272,9 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
     /* Reacquire the mutex before returning. */
     vlc_mutex_lock( p_mutex );
 
-    i_result = 0;
-
 #elif defined( WIN32 )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
+
     if( !p_condvar->semaphore )
     {
         /* Increase our wait count */
@@ -460,22 +348,7 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
     /* Reacquire the mutex before returning. */
     vlc_mutex_lock( p_mutex );
 
-    i_result = 0;
-
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
-    if( p_condvar == NULL )
-    {
-        i_result = B_BAD_VALUE;
-    }
-    else if( p_mutex == NULL )
-    {
-        i_result = B_BAD_VALUE;
-    }
-    else if( p_condvar->init < 2000 )
-    {
-        i_result = B_NO_INIT;
-    }
-
     /* The p_condvar->thread var is initialized before the unlock because
      * it enables to identify when the thread is interrupted beetwen the
      * unlock line and the suspend_thread line */
@@ -485,56 +358,153 @@ static inline int __vlc_cond_wait( const char * psz_file, int i_line,
     p_condvar->thread = -1;
 
     vlc_mutex_lock( p_mutex );
-    i_result = 0;
 
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
+    int val = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
+    VLC_THREAD_ASSERT ("waiting on condition");
+
+#endif
+}
+
 
-#   ifdef DEBUG
-    /* In debug mode, timeout */
-    struct timeval now;
-    struct timespec timeout;
+/*****************************************************************************
+ * vlc_cond_timedwait: wait until condition completion or expiration
+ *****************************************************************************
+ * Returns 0 if object signaled, an error code in case of timeout or error.
+ *****************************************************************************/
+#define vlc_cond_timedwait( P_COND, P_MUTEX, DEADLINE )                      \
+    __vlc_cond_timedwait( __FILE__, __LINE__, P_COND, P_MUTEX, DEADLINE  )
 
-    gettimeofday( &now, NULL );
-    timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
-    timeout.tv_nsec = now.tv_usec * 1000;
+static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
+                                        vlc_cond_t *p_condvar,
+                                        vlc_mutex_t *p_mutex,
+                                        mtime_t deadline )
+{
+#if defined( UNDER_CE )
+    mtime_t delay_ms = (deadline - mdate())/1000;
 
-    i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex,
-                                       &timeout );
+    DWORD result;
+    if( delay_ms < 0 )
+        delay_ms = 0;
 
-    if( i_result == ETIMEDOUT )
-    {
-        msg_Dbg( p_condvar->p_this,
-                  "thread %li: probable condition deadlock "
-                  "at %s:%d (%s)", CAST_PTHREAD_TO_INT(pthread_self()),
-                  psz_file, i_line, strerror(i_result) );
+    p_condvar->i_waiting_threads++;
+    LeaveCriticalSection( &p_mutex->csection );
+    result = WaitForSingleObject( p_condvar->event, delay_ms );
+    p_condvar->i_waiting_threads--;
 
-        i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
-    }
+    /* Reacquire the mutex before returning. */
+    vlc_mutex_lock( p_mutex );
+
+    if(result == WAIT_TIMEOUT)
+       return ETIMEDOUT; /* this error is perfectly normal */
+
+#elif defined( WIN32 )
+    VLC_UNUSED( psz_file); VLC_UNUSED( i_line );
 
-#   else
-    i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
-#   endif
+    DWORD result;
 
-    if ( i_result )
+    mtime_t delay_ms = (deadline - mdate())/1000;
+    if( delay_ms < 0 )
+        delay_ms = 0;
+
+    if( !p_condvar->semaphore )
     {
-        i_thread = CAST_PTHREAD_TO_INT(pthread_self());
-        psz_error = strerror(i_result);
+        /* Increase our wait count */
+        p_condvar->i_waiting_threads++;
+
+        if( p_mutex->mutex )
+        {
+            /* It is only possible to atomically release the mutex and
+             * initiate the waiting on WinNT/2K/XP. Win9x doesn't have
+             * SignalObjectAndWait(). */
+            result = p_condvar->SignalObjectAndWait( p_mutex->mutex,
+                                            p_condvar->event,
+                                            delay_ms, FALSE );
+        }
+        else
+        {
+            LeaveCriticalSection( &p_mutex->csection );
+            result = WaitForSingleObject( p_condvar->event, delay_ms );
+        }
+
+        p_condvar->i_waiting_threads--;
     }
+    else if( p_condvar->i_win9x_cv == 1 )
+    {
+        int i_waiting_threads;
 
-#elif defined( HAVE_CTHREADS_H )
-    condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
-    i_result = 0;
+        /* Wait for the gate to be open */
+        result = WaitForSingleObject( p_condvar->event, delay_ms );
 
-#endif
+        /* Increase our wait count */
+        p_condvar->i_waiting_threads++;
+
+        LeaveCriticalSection( &p_mutex->csection );
+        if( !result )
+        {
+            /* recaculate remaining delay */
+            delay_ms = (deadline - mdate())/1000;
+            if( delay_ms < 0 )
+                delay_ms = 0;
+
+            result = WaitForSingleObject( p_condvar->semaphore, delay_ms );
+        }
 
-    if( i_result )
+        /* Decrement and test must be atomic */
+        EnterCriticalSection( &p_condvar->csection );
+
+        /* Decrease our wait count */
+        i_waiting_threads = --p_condvar->i_waiting_threads;
+
+        LeaveCriticalSection( &p_condvar->csection );
+
+        /* Reopen the gate if we were the last waiting thread */
+        if( !i_waiting_threads )
+            SetEvent( p_condvar->event );
+    }
+    else
     {
-        msg_Err( p_condvar->p_this,
-                 "thread %li: cond_wait failed at %s:%d (%d:%s)",
-                 i_thread, psz_file, i_line, i_result, psz_error );
+        int i_waiting_threads;
+
+        /* Increase our wait count */
+        p_condvar->i_waiting_threads++;
+
+        LeaveCriticalSection( &p_mutex->csection );
+        result = WaitForSingleObject( p_condvar->semaphore, delay_ms );
+
+        /* Decrement and test must be atomic */
+        EnterCriticalSection( &p_condvar->csection );
+
+        /* Decrease our wait count */
+        i_waiting_threads = --p_condvar->i_waiting_threads;
+
+        LeaveCriticalSection( &p_condvar->csection );
+
+        /* Signal that the last waiting thread just went through */
+        if( !i_waiting_threads )
+            SetEvent( p_condvar->event );
     }
 
-    return i_result;
+    /* Reacquire the mutex before returning. */
+    vlc_mutex_lock( p_mutex );
+    if(result == WAIT_TIMEOUT)
+       return ETIMEDOUT; /* this error is perfectly normal */
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+#   error Unimplemented
+
+#elif defined(LIBVLC_USE_PTHREAD)
+    lldiv_t d = lldiv( deadline, 1000000 );
+    struct timespec ts = { d.quot, d.rem * 1000 };
+
+    int val = pthread_cond_timedwait (&p_condvar->cond, &p_mutex->mutex, &ts);
+    if (val == ETIMEDOUT)
+        return ETIMEDOUT; /* this error is perfectly normal */
+    VLC_THREAD_ASSERT ("timed-waiting on condition");
+
+#endif
+
+    return 0;
 }
 
 /*****************************************************************************
@@ -543,6 +513,146 @@ 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( 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( HAVE_KERNEL_SCHEDULER_H )
+    return -1;
+
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    i_ret = ( TlsSetValue( p_tls->handle, p_value ) != 0 );
+
+#elif defined(LIBVLC_USE_PTHREAD)
+    i_ret = pthread_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( HAVE_KERNEL_SCHEDULER_H )
+    p_ret = NULL;
+#elif defined( UNDER_CE ) || defined( WIN32 )
+    p_ret = TlsGetValue( p_tls->handle );
+
+#elif defined(LIBVLC_USE_PTHREAD)
+    p_ret = pthread_getspecific( p_tls->handle );
+
+#endif
+
+    return p_ret;
+}
+
+# if defined (_POSIX_SPIN_LOCKS) && ((_POSIX_SPIN_LOCKS - 0) > 0)
+typedef struct
+{
+    pthread_spinlock_t  spin;
+} vlc_spinlock_t;
+
+/**
+ * Initializes a spinlock.
+ */
+static inline int vlc_spin_init (vlc_spinlock_t *spin)
+{
+    return pthread_spin_init (&spin->spin, PTHREAD_PROCESS_PRIVATE);
+}
+
+/**
+ * Acquires a spinlock.
+ */
+static inline void vlc_spin_lock (vlc_spinlock_t *spin)
+{
+    int val = pthread_spin_lock (&spin->spin);
+    assert (val == 0);
+}
+
+/**
+ * Releases a spinlock.
+ */
+static inline void vlc_spin_unlock (vlc_spinlock_t *spin)
+{
+    int val = pthread_spin_unlock (&spin->spin);
+    assert (val == 0);
+}
+
+/**
+ * Deinitializes a spinlock.
+ */
+static inline void vlc_spin_destroy (vlc_spinlock_t *spin)
+{
+    int val = pthread_spin_destroy (&spin->spin);
+    assert (val == 0);
+}
+
+#elif defined( WIN32 )
+
+typedef CRITICAL_SECTION vlc_spinlock_t;
+
+/**
+ * Initializes a spinlock.
+ */
+static inline int vlc_spin_init (vlc_spinlock_t *spin)
+{
+    return !InitializeCriticalSectionAndSpinCount(spin, 4000);
+}
+
+/**
+ * Acquires a spinlock.
+ */
+static inline void vlc_spin_lock (vlc_spinlock_t *spin)
+{
+    EnterCriticalSection(spin);
+}
+
+/**
+ * Releases a spinlock.
+ */
+static inline void vlc_spin_unlock (vlc_spinlock_t *spin)
+{
+    LeaveCriticalSection(spin);
+}
+
+/**
+ * Deinitializes a spinlock.
+ */
+static inline void vlc_spin_destroy (vlc_spinlock_t *spin)
+{
+    DeleteCriticalSection(spin);
+}
+
+
+#else
+
+/* Fallback to plain mutexes if spinlocks are not available */
+typedef vlc_mutex_t vlc_spinlock_t;
+
+static inline int vlc_spin_init (vlc_spinlock_t *spin)
+{
+    return __vlc_mutex_init (spin);
+}
+
+# define vlc_spin_lock    vlc_mutex_lock
+# define vlc_spin_unlock  vlc_mutex_unlock
+# define vlc_spin_destroy vlc_mutex_destroy
+#endif
+
 /*****************************************************************************
  * vlc_thread_create: create a thread
  *****************************************************************************/
@@ -566,3 +676,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