/*****************************************************************************
* Function definitions
*****************************************************************************/
+VLC_EXPORT( void, vlc_threads_error, ( vlc_object_t *) );
VLC_EXPORT( int, __vlc_mutex_init, ( vlc_object_t *, vlc_mutex_t * ) );
+VLC_EXPORT( int, __vlc_mutex_init_recursive, ( 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( void, __vlc_thread_ready, ( vlc_object_t * ) );
VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
-#include <errno.h>
+/*****************************************************************************
+ * vlc_threads_error: Signalize an error in the threading system
+ *****************************************************************************/
+#ifdef NDEBUG
+# define vlc_threads_error( P_THIS ) (void)0
+#endif
/*****************************************************************************
* vlc_threads_init: initialize threads system
#define vlc_mutex_init( P_THIS, P_MUTEX ) \
__vlc_mutex_init( VLC_OBJECT(P_THIS), 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( VLC_OBJECT(P_THIS), P_MUTEX )
+
/*****************************************************************************
* vlc_mutex_lock: lock a mutex
*****************************************************************************/
#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
-#else
-# define CAST_PTHREAD_TO_INT(t) (unsigned long int)t
+#if defined(LIBVLC_USE_PTHREAD)
+static inline unsigned long int CAST_PTHREAD_TO_INT (pthread_t th)
+{
+ union { pthread_t th; unsigned long int i; } v = { };
+ v.th = th;
+ return v.i;
+}
#endif
static inline int __vlc_mutex_lock( const char * psz_file, int i_line,
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 );
-
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
EnterCriticalSection( &p_mutex->csection );
i_result = 0;
i_result = acquire_sem( p_mutex->lock );
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
# define vlc_assert_locked( m ) \
assert (pthread_mutex_lock (&((m)->mutex)) == EDEADLK)
if ( i_result )
{
i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_result);
+ errno = i_result;
}
-#elif defined( HAVE_CTHREADS_H )
- mutex_lock( p_mutex->mutex );
- i_result = 0;
-
#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 );
+ "thread %li: mutex_lock failed at %s:%d (%d:%m)",
+ i_thread, psz_file, i_line, i_result );
+ vlc_threads_error( p_mutex->p_this );
}
return i_result;
}
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 );
-#elif defined( UNDER_CE )
+#if defined( UNDER_CE )
LeaveCriticalSection( &p_mutex->csection );
i_result = 0;
return B_OK;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
i_result = pthread_mutex_unlock( &p_mutex->mutex );
if ( i_result )
{
i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_result);
+ errno = i_result;
}
-#elif defined( HAVE_CTHREADS_H )
- mutex_unlock( p_mutex );
- i_result = 0;
-
#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 );
+ "thread %li: mutex_unlock failed at %s:%d (%d:%m)",
+ i_thread, psz_file, i_line, i_result );
+ vlc_threads_error( p_mutex->p_this );
}
return i_result;
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_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 )
+#if defined( UNDER_CE )
PulseEvent( p_condvar->event );
i_result = 0;
* 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 )
i_result = 0;
}
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
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 );
+ errno = i_result;
}
- i_result = 0;
#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 );
+ "thread %li: cond_signal failed at %s:%d (%d:%m)",
+ i_thread, psz_file, i_line, i_result );
+ vlc_threads_error( p_condvar->p_this );
}
return i_result;
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 );
vlc_mutex_lock( p_mutex );
i_result = 0;
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
# ifdef DEBUG
/* In debug mode, timeout */
- struct timespec timeout;
-
-# if (_POSIX_CLOCK_MONOTONIC - 0 >= 0)
- if( clock_gettime( CLOCK_MONOTONIC, &timeout ) )
-# endif
- clock_gettime( CLOCK_REALTIME, &timeout );
-
- timeout.tv_sec += THREAD_COND_TIMEOUT;
+ struct timespec timeout = {
+ (mdate() / 1000000) + THREAD_COND_TIMEOUT,
+ 0 /* 1Hz precision is sufficient here :-) */
+ };
i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex,
&timeout );
if( i_result == ETIMEDOUT )
{
+ errno = ETIMEDOUT;
msg_Dbg( p_condvar->p_this,
"thread %li: possible condition deadlock "
- "at %s:%d (%s)", CAST_PTHREAD_TO_INT(pthread_self()),
- psz_file, i_line, strerror(i_result) );
+ "at %s:%d (%m)", CAST_PTHREAD_TO_INT(pthread_self()),
+ psz_file, i_line );
i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex );
}
if ( i_result )
{
i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_result);
+ errno = i_result;
}
-#elif defined( HAVE_CTHREADS_H )
- condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
- i_result = 0;
-
#endif
if( i_result )
{
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 );
+ "thread %li: cond_wait failed at %s:%d (%d:%m)",
+ i_thread, psz_file, i_line, i_result );
+ vlc_threads_error( p_condvar->p_this );
}
return i_result;
/*****************************************************************************
* 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 )
{
int i_res;
unsigned long int i_thread = 0;
- const char * psz_error = "";
-#if defined( PTH_INIT_IN_PTH_H )
-# error Unimplemented
-#elif defined( ST_INIT_IN_ST_H )
-# error Unimplemented
-#elif defined( UNDER_CE )
-# error Unimplemented
+#if defined( UNDER_CE )
+ mtime_t delay_ms = (deadline - mdate())/1000;
+
+ DWORD result;
+ if( delay_ms < 0 )
+ delay_ms = 0;
+
+ p_condvar->i_waiting_threads++;
+ LeaveCriticalSection( &p_mutex->csection );
+ result = WaitForSingleObject( p_condvar->event, delay_ms );
+ p_condvar->i_waiting_threads--;
+
+ /* Reacquire the mutex before returning. */
+ vlc_mutex_lock( p_mutex );
+
+ i_res = (int)result;
+ if(result == WAIT_TIMEOUT)
+ return WAIT_TIMEOUT; /* this error is perfectly normal */
+
#elif defined( WIN32 )
-# error Unimplemented FIXME FIXME
+ DWORD result;
+
+ mtime_t delay_ms = (deadline - mdate())/1000;
+ if( delay_ms < 0 )
+ delay_ms = 0;
+
+ if( !p_condvar->semaphore )
+ {
+ /* 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;
+
+ /* Wait for the gate to be open */
+ result = WaitForSingleObject( p_condvar->event, delay_ms );
+
+ /* 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 );
+ }
+
+ /* 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
+ {
+ 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 );
+ }
+
+ /* Reacquire the mutex before returning. */
+ vlc_mutex_lock( p_mutex );
+ if(result == WAIT_TIMEOUT)
+ return WAIT_TIMEOUT; /* this error is perfectly normal */
+
+ i_res = (int)result;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
# error Unimplemented
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
lldiv_t d = lldiv( deadline, 1000000 );
struct timespec ts = { d.quot, d.rem * 1000 };
i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts );
if( i_res == ETIMEDOUT )
- i_res = 0; /* this error is perfectly normal */
+ return ETIMEDOUT; /* this error is perfectly normal */
else
if ( i_res ) /* other errors = bug */
{
i_thread = CAST_PTHREAD_TO_INT(pthread_self());
- psz_error = strerror(i_res);
+ errno = i_res;
}
-#elif defined( HAVE_CTHREADS_H )
-# error Unimplemented
#endif
if( i_res )
{
msg_Err( p_condvar->p_this,
- "thread %li: cond_wait failed at %s:%d (%d:%s)",
- i_thread, psz_file, i_line, i_res, psz_error );
+ "thread %li: cond_wait failed at %s:%d (%d:%m)",
+ i_thread, psz_file, i_line, i_res );
+ vlc_threads_error( p_condvar->p_this );
}
return i_res;
{
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 )
+#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( PTHREAD_COND_T_IN_PTHREAD_H )
+#elif defined(LIBVLC_USE_PTHREAD)
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;
{
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 )
+#if 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 )
+#elif defined(LIBVLC_USE_PTHREAD)
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;
}
+# 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 int vlc_spin_lock (vlc_spinlock_t *spin)
+{
+ return pthread_spin_lock (&spin->spin);
+}
+
+/**
+ * Releases a spinlock.
+ */
+static inline int vlc_spin_unlock (vlc_spinlock_t *spin)
+{
+ return pthread_spin_unlock (&spin->spin);
+}
+
+/**
+ * Deinitializes a spinlock.
+ */
+static inline int vlc_spin_destroy (vlc_spinlock_t *spin)
+{
+ return pthread_spin_destroy (&spin->spin);
+}
+
+#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 int vlc_spin_lock (vlc_spinlock_t *spin)
+{
+ EnterCriticalSection(spin);
+ return 0;
+}
+
+/**
+ * Releases a spinlock.
+ */
+static inline int vlc_spin_unlock (vlc_spinlock_t *spin)
+{
+ LeaveCriticalSection(spin);
+ return 0;
+}
+
+/**
+ * Deinitializes a spinlock.
+ */
+static inline int vlc_spin_destroy (vlc_spinlock_t *spin)
+{
+ DeleteCriticalSection(spin);
+ return 0;
+}
+
+
+#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 (NULL, 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
*****************************************************************************/