* This header provides a portable threads implementation.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
+ * $Id: threads.h,v 1.34 2002/01/04 14:01:34 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
#include <stdio.h>
-#if defined(HAVE_PTHREAD_H) /* pthreads (Linux & BSD for example) */
-#include <pthread.h>
+#if defined(GPROF) || defined(DEBUG)
+# include <sys/time.h>
+#endif
+
+#if defined( PTH_INIT_IN_PTH_H ) /* GNU Pth */
+# include <pth.h>
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */
+# include <pthread.h>
+/* This is not prototyped under Linux, though it exists. */
+int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind );
-#elif defined(HAVE_CTHREADS_H) /* GNUMach */
-#include <cthreads.h>
+#elif defined( HAVE_CTHREADS_H ) /* GNUMach */
+# include <cthreads.h>
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */
+# undef MAX
+# undef MIN
+# include <kernel/OS.h>
+# include <kernel/scheduler.h>
+# include <byteorder.h>
+
+#elif defined( WIN32 )
+#define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# include <process.h>
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H) /* BeOS */
-#undef MAX
-#undef MIN
-#include <kernel/OS.h>
-#include <kernel/scheduler.h>
-#include <byteorder.h>
#else
-#error no threads available on your system !
+# error no threads available on your system !
+
#endif
/*****************************************************************************
* Types definition
*****************************************************************************/
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+typedef pth_t vlc_thread_t;
+typedef pth_mutex_t vlc_mutex_t;
+typedef pth_cond_t vlc_cond_t;
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+typedef pthread_t vlc_thread_t;
+typedef pthread_mutex_t vlc_mutex_t;
+typedef pthread_cond_t vlc_cond_t;
+
+#elif defined( HAVE_CTHREADS_H )
typedef cthread_t vlc_thread_t;
-/* those structs are the ones defined in /include/cthreads.h but we need
+/* Those structs are the ones defined in /include/cthreads.h but we need
* to handle (*foo) where foo is a (mutex_t) while they handle (foo) where
* foo is a (mutex_t*) */
typedef struct s_mutex {
struct cond_imp *implications;
} vlc_cond_t;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
-
-/* This is the BeOS implementation of the vlc thread, note that the mutex is
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+/* This is the BeOS implementation of the vlc threads, note that the mutex is
* not a real mutex and the cond_var is not like a pthread cond_var but it is
* enough for what wee need */
thread_id thread;
} vlc_cond_t;
-#elif defined(HAVE_PTHREAD_H)
+#elif defined( WIN32 )
+typedef HANDLE vlc_thread_t;
+typedef CRITICAL_SECTION vlc_mutex_t;
-typedef pthread_t vlc_thread_t;
-typedef pthread_mutex_t vlc_mutex_t;
-typedef pthread_cond_t vlc_cond_t;
+typedef struct
+{
+ int i_waiting_threads;
+ HANDLE signal;
+} vlc_cond_t;
+
+typedef unsigned (__stdcall *PTHREAD_START) (void *);
#endif
* Prototypes
*****************************************************************************/
-static __inline__ int vlc_thread_create( vlc_thread_t *p_thread, char *psz_name,
- vlc_thread_func_t func, void *p_data );
-static __inline__ void vlc_thread_exit ( void );
-static __inline__ void vlc_thread_join ( vlc_thread_t thread );
+#ifdef GPROF
+/* Wrapper function for profiling */
+static void * vlc_thread_wrapper ( void *p_wrapper );
-static __inline__ int vlc_mutex_init ( vlc_mutex_t *p_mutex );
-static __inline__ int vlc_mutex_lock ( vlc_mutex_t *p_mutex );
-static __inline__ int vlc_mutex_unlock ( vlc_mutex_t *p_mutex );
+# ifdef WIN32
-static __inline__ int vlc_cond_init ( vlc_cond_t *p_condvar );
-static __inline__ int vlc_cond_signal ( vlc_cond_t *p_condvar );
-static __inline__ int vlc_cond_wait ( vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex );
+# define ITIMER_REAL 1
+# define ITIMER_PROF 2
-#if 0
-static _inline__ int vlc_cond_timedwait ( vlc_cond_t * condvar, vlc_mutex_t * mutex,
- mtime_t absoute_timeout_time );
-#endif
+struct itimerval
+{
+ struct timeval it_value;
+ struct timeval it_interval;
+};
-/*****************************************************************************
- * vlc_thread_create: create a thread
- *****************************************************************************/
-static __inline__ int vlc_thread_create( vlc_thread_t *p_thread,
- char *psz_name, vlc_thread_func_t func,
- void *p_data)
+int setitimer(int kind, const struct itimerval* itnew, struct itimerval* itold);
+
+# endif /* WIN32 */
+
+typedef struct wrapper_s
{
-#if defined(HAVE_CTHREADS_H)
- *p_thread = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
- return 0;
+ /* Data lock access */
+ vlc_mutex_t lock;
+ vlc_cond_t wait;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
- *p_thread = spawn_thread( (thread_func)func, psz_name,
- B_NORMAL_PRIORITY, p_data );
- return resume_thread( *p_thread );
+ /* Data used to spawn the real thread */
+ vlc_thread_func_t func;
+ void *p_data;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_create( p_thread, NULL, func, p_data );
+ /* Profiling timer passed to the thread */
+ struct itimerval itimer;
-#endif
-}
+} wrapper_t;
+
+#endif /* GPROF */
/*****************************************************************************
- * vlc_thread_exit: terminate a thread
+ * vlc_threads_init: initialize threads system
*****************************************************************************/
-static __inline__ void vlc_thread_exit( void )
+static __inline__ int vlc_threads_init( void )
{
-#if defined(HAVE_CTHREADS_H)
- int result;
- cthread_exit( &result );
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_init();
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
- exit_thread( 0 );
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return 0;
-#elif defined(HAVE_PTHREAD_H)
- pthread_exit( 0 );
+#elif defined( HAVE_CTHREADS_H )
+ return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ return 0;
+
+#elif defined( WIN32 )
+ return 0;
#endif
}
/*****************************************************************************
- * vlc_thread_join: wait until a thread exits
+ * vlc_threads_end: stop threads system
*****************************************************************************/
-static __inline__ void vlc_thread_join( vlc_thread_t thread )
+static __inline__ int vlc_threads_end( void )
{
-#if defined(HAVE_CTHREADS_H)
- cthread_join( thread );
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_kill();
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
- int32 exit_value;
- wait_for_thread( thread, &exit_value );
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return 0;
-#elif defined(HAVE_PTHREAD_H)
- pthread_join( thread, NULL );
+#elif defined( HAVE_CTHREADS_H )
+ return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ return 0;
+
+#elif defined( WIN32 )
+ return 0;
#endif
}
*****************************************************************************/
static __inline__ int vlc_mutex_init( vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_mutex_init( p_mutex );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+# if defined(DEBUG) && defined(SYS_LINUX)
+ /* Create error-checking mutex to detect threads problems more easily. */
+ pthread_mutexattr_t attr;
+ int i_result;
+
+ pthread_mutexattr_init( &attr );
+ pthread_mutexattr_setkind_np( &attr, PTHREAD_MUTEX_ERRORCHECK_NP );
+ i_result = pthread_mutex_init( p_mutex, &attr );
+ pthread_mutexattr_destroy( &attr );
+ return( i_result );
+# endif
+
+ return pthread_mutex_init( p_mutex, NULL );
+
+#elif defined( HAVE_CTHREADS_H )
mutex_init( p_mutex );
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+
+ /* check the arguments and whether it's already been initialized */
+ if( p_mutex == NULL )
+ {
+ return B_BAD_VALUE;
+ }
- // check the arguments and whether it's already been initialized
- if( p_mutex == NULL ) return B_BAD_VALUE;
if( p_mutex->init == 9999 )
{
return EALREADY;
p_mutex->lock = create_sem( 1, "BeMutex" );
if( p_mutex->lock < B_NO_ERROR )
+ {
return( -1 );
+ }
+
p_mutex->init = 9999;
return B_OK;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_mutex_init( p_mutex, NULL );
+#elif defined( WIN32 )
+ InitializeCriticalSection( p_mutex );
+ return 0;
#endif
}
/*****************************************************************************
* vlc_mutex_lock: lock a mutex
*****************************************************************************/
-static __inline__ int vlc_mutex_lock( vlc_mutex_t *p_mutex )
+#ifdef DEBUG
+# define vlc_mutex_lock( P_MUTEX ) \
+ _vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
+#else
+# define vlc_mutex_lock( P_MUTEX ) \
+ _vlc_mutex_lock( NULL, 0, P_MUTEX )
+#endif
+
+static __inline__ int _vlc_mutex_lock( char * psz_file, int i_line,
+ vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_mutex_acquire( p_mutex, TRUE, NULL );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ int i_return = pthread_mutex_lock( p_mutex );
+ if( i_return )
+ {
+ intf_ErrMsg( "thread %d error: mutex_lock failed at %s:%d (%s)",
+ pthread_self(), psz_file, i_line, strerror(i_return) );
+ }
+ return i_return;
+
+#elif defined( HAVE_CTHREADS_H )
mutex_lock( p_mutex );
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
status_t err;
- if( !p_mutex ) return B_BAD_VALUE;
- if( p_mutex->init < 2000 ) return B_NO_INIT;
+ if( !p_mutex )
+ {
+ return B_BAD_VALUE;
+ }
+
+ if( p_mutex->init < 2000 )
+ {
+ return B_NO_INIT;
+ }
err = acquire_sem( p_mutex->lock );
return err;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_mutex_lock( p_mutex );
+#elif defined( WIN32 )
+ EnterCriticalSection( p_mutex );
+ return 0;
#endif
}
/*****************************************************************************
* vlc_mutex_unlock: unlock a mutex
*****************************************************************************/
-static __inline__ int vlc_mutex_unlock( vlc_mutex_t *p_mutex )
+#ifdef DEBUG
+# define vlc_mutex_unlock( P_MUTEX ) \
+ _vlc_mutex_unlock( __FILE__, __LINE__, P_MUTEX )
+#else
+# define vlc_mutex_unlock( P_MUTEX ) \
+ _vlc_mutex_unlock( NULL, 0, P_MUTEX )
+#endif
+
+static __inline__ int _vlc_mutex_unlock( char * psz_file, int i_line,
+ vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_mutex_release( p_mutex );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ int i_return = pthread_mutex_unlock( p_mutex );
+ if( i_return )
+ {
+ intf_ErrMsg( "thread %d error: mutex_unlock failed at %s:%d (%s)",
+ pthread_self(), psz_file, i_line, strerror(i_return) );
+ }
+ return i_return;
+
+#elif defined( HAVE_CTHREADS_H )
mutex_unlock( p_mutex );
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ if( !p_mutex)
+ {
+ return B_BAD_VALUE;
+ }
- if(! p_mutex) return B_BAD_VALUE;
- if( p_mutex->init < 2000 ) return B_NO_INIT;
+ if( p_mutex->init < 2000 )
+ {
+ return B_NO_INIT;
+ }
release_sem( p_mutex->lock );
return B_OK;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_mutex_unlock( p_mutex );
+#elif defined( WIN32 )
+ LeaveCriticalSection( p_mutex );
+ return 0;
#endif
}
+/*****************************************************************************
+ * vlc_mutex_destroy: destroy a mutex
+ *****************************************************************************/
+#ifdef DEBUG
+# define vlc_mutex_destroy( P_MUTEX ) \
+ _vlc_mutex_destroy( __FILE__, __LINE__, P_MUTEX )
+#else
+# define vlc_mutex_destroy( P_MUTEX ) \
+ _vlc_mutex_destroy( NULL, 0, P_MUTEX )
+#endif
+
+static __inline__ int _vlc_mutex_destroy( char * psz_file, int i_line,
+ vlc_mutex_t *p_mutex )
+{
+#if defined( PTH_INIT_IN_PTH_H )
+ return 0;
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ int i_return = pthread_mutex_destroy( p_mutex );
+ if( i_return )
+ {
+ intf_ErrMsg( "thread %d error: mutex_destroy failed at %s:%d (%s)",
+ pthread_self(), psz_file, i_line, strerror(i_return) );
+ }
+ return i_return;
+
+#elif defined( HAVE_CTHREADS_H )
+ return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ if( p_mutex->init == 9999 )
+ {
+ delete_sem( p_mutex->lock );
+ }
+
+ p_mutex->init = 0;
+ return B_OK;
+
+#elif defined( WIN32 )
+ DeleteCriticalSection( p_mutex );
+ return 0;
+
+#endif
+}
+
/*****************************************************************************
* vlc_cond_init: initialize a condition
*****************************************************************************/
static __inline__ int vlc_cond_init( vlc_cond_t *p_condvar )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_cond_init( p_condvar );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return pthread_cond_init( p_condvar, NULL );
+
+#elif defined( HAVE_CTHREADS_H )
/* condition_init() */
spin_lock_init( &p_condvar->lock );
cthread_queue_init( &p_condvar->queue );
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( !p_condvar )
+ {
return B_BAD_VALUE;
+ }
if( p_condvar->init == 9999 )
+ {
return EALREADY;
+ }
p_condvar->thread = -1;
p_condvar->init = 9999;
return 0;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_init( p_condvar, NULL );
+#elif defined( WIN32 )
+ /* initialise counter */
+ p_condvar->i_waiting_threads = 0;
+ /* Create an auto-reset event. */
+ p_condvar->signal = CreateEvent( NULL, /* no security */
+ FALSE, /* auto-reset event */
+ FALSE, /* non-signaled initially */
+ NULL ); /* unnamed */
+
+ return( !p_condvar->signal );
+
#endif
}
*****************************************************************************/
static __inline__ int vlc_cond_signal( vlc_cond_t *p_condvar )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_cond_notify( p_condvar, FALSE );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return pthread_cond_signal( p_condvar );
+
+#elif defined( HAVE_CTHREADS_H )
/* condition_signal() */
if ( p_condvar->queue.head || p_condvar->implications )
{
}
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( !p_condvar )
+ {
return B_BAD_VALUE;
+ }
if( p_condvar->init < 2000 )
+ {
return B_NO_INIT;
+ }
while( p_condvar->thread != -1 )
{
thread_info info;
if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE )
+ {
return 0;
+ }
- // is the thread sleeping ?
if( info.state != B_THREAD_SUSPENDED )
{
- // wait a little
+ /* 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
+ /* Ok, we have to wake up that thread */
resume_thread( p_condvar->thread );
return 0;
}
}
-
return 0;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_signal( p_condvar );
+#elif defined( WIN32 )
+ /* 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 */
+ int i_waiting_threads = p_condvar->i_waiting_threads;
+ while( p_condvar->i_waiting_threads
+ && p_condvar->i_waiting_threads == i_waiting_threads )
+ {
+ PulseEvent( p_condvar->signal );
+ Sleep( 0 ); /* deschedule the current thread */
+ }
+ return 0;
+
+#endif
+}
+
+/*****************************************************************************
+ * vlc_cond_broadcast: start all threads waiting on condition completion
+ *****************************************************************************/
+/*
+ * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
+ * Only works with pthreads, you need to adapt it for others
+ * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
+ */
+static __inline__ int vlc_cond_broadcast( vlc_cond_t *p_condvar )
+{
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_cond_notify( p_condvar, FALSE );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ return pthread_cond_broadcast( p_condvar );
+
+#elif defined( HAVE_CTHREADS_H )
+ /* condition_signal() */
+ if ( p_condvar->queue.head || p_condvar->implications )
+ {
+ cond_signal( (condition_t)p_condvar );
+ }
+ return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ if( !p_condvar )
+ {
+ return B_BAD_VALUE;
+ }
+
+ if( p_condvar->init < 2000 )
+ {
+ return B_NO_INIT;
+ }
+
+ while( p_condvar->thread != -1 )
+ {
+ 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;
+ }
+ }
+ return 0;
+
+#elif defined( WIN32 )
+ /* Release all waiting threads. */
+ /* 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 */
+ while( p_condvar->i_waiting_threads )
+ {
+ PulseEvent( p_condvar->signal );
+ Sleep( 0 ); /* deschedule the current thread */
+ }
+ return 0;
#endif
}
/*****************************************************************************
* vlc_cond_wait: wait until condition completion
*****************************************************************************/
-static __inline__ int vlc_cond_wait( vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex )
+#ifdef DEBUG
+# define vlc_cond_wait( P_COND, P_MUTEX ) \
+ _vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX )
+#else
+# define vlc_cond_wait( P_COND, P_MUTEX ) \
+ _vlc_cond_wait( NULL, 0, P_COND, P_MUTEX )
+#endif
+
+static __inline__ int _vlc_cond_wait( char * psz_file, int i_line,
+ vlc_cond_t *p_condvar,
+ vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined( PTH_INIT_IN_PTH_H )
+ return pth_cond_await( p_condvar, p_mutex, NULL );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+
+#ifndef DEBUG
+ return pthread_cond_wait( p_condvar, p_mutex );
+#else
+ /* In debug mode, timeout */
+ struct timeval now;
+ struct timespec timeout;
+ int i_result;
+
+ for( ; ; )
+ {
+ gettimeofday( &now, NULL );
+ timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
+ timeout.tv_nsec = now.tv_usec * 1000;
+
+ if( (i_result = pthread_cond_timedwait( p_condvar, p_mutex, &timeout )) )
+ {
+ intf_WarnMsg( 1, "thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)",
+ pthread_self(), psz_file, i_line, strerror(i_result) );
+ }
+ else
+ {
+ return i_result;
+ }
+ }
+#endif
+
+#elif defined( HAVE_CTHREADS_H )
condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
return 0;
-#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( !p_condvar )
+ {
return B_BAD_VALUE;
+ }
if( !p_mutex )
+ {
return B_BAD_VALUE;
+ }
if( p_condvar->init < 2000 )
+ {
return 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 */
p_condvar->thread = find_thread( NULL );
vlc_mutex_unlock( p_mutex );
suspend_thread( p_condvar->thread );
vlc_mutex_lock( p_mutex );
return 0;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_wait( p_condvar, p_mutex );
+#elif defined( WIN32 )
+ /* The ideal would be to use a function which atomically releases the
+ * mutex and initiate the waiting.
+ * Unfortunately only the SignalObjectAndWait function does this and it's
+ * only supported on WinNT/2K, furthermore it cannot take multiple
+ * events as parameters.
+ *
+ * The solution we use should however fulfill all our needs (even though
+ * it is not a correct pthreads implementation)
+ */
+ int i_result;
+
+ p_condvar->i_waiting_threads ++;
+
+ /* Release the mutex */
+ vlc_mutex_unlock( p_mutex );
+
+ i_result = WaitForSingleObject( p_condvar->signal, INFINITE);
+
+ /* maybe we should protect this with a mutex ? */
+ p_condvar->i_waiting_threads --;
+
+ /* Reacquire the mutex before returning. */
+ vlc_mutex_lock( p_mutex );
+
+ return( i_result == WAIT_FAILED );
#endif
}
+/*****************************************************************************
+ * vlc_cond_destroy: destroy a condition
+ *****************************************************************************/
+#ifdef DEBUG
+# define vlc_cond_destroy( P_COND ) \
+ _vlc_cond_destroy( __FILE__, __LINE__, P_COND )
+#else
+# define vlc_cond_destroy( P_COND ) \
+ _vlc_cond_destroy( NULL, 0, P_COND )
+#endif
+
+static __inline__ int _vlc_cond_destroy( char * psz_file, int i_line,
+ vlc_cond_t *p_condvar )
+{
+#if defined( PTH_INIT_IN_PTH_H )
+ return 0;
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ int i_result = pthread_cond_destroy( p_condvar );
+ if( i_result )
+ {
+ intf_ErrMsg( "thread %d error: cond_destroy failed at %s:%d (%s)",
+ pthread_self(), psz_file, i_line, strerror(i_result) );
+ }
+ return i_result;
+
+#elif defined( HAVE_CTHREADS_H )
+ return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ p_condvar->init = 0;
+ return 0;
+
+#elif defined( WIN32 )
+ return( !CloseHandle( p_condvar->signal ) );
+
+#endif
+}
+
+/*****************************************************************************
+ * vlc_thread_create: create a thread
+ *****************************************************************************/
+#ifdef DEBUG
+# define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
+ _vlc_thread_create( __FILE__, __LINE__, P_THREAD, PSZ_NAME, FUNC, P_DATA )
+#else
+# define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
+ _vlc_thread_create( NULL, 0, P_THREAD, PSZ_NAME, FUNC, P_DATA )
+#endif
+
+static __inline__ int _vlc_thread_create( char * psz_file, int i_line,
+ vlc_thread_t *p_thread,
+ char *psz_name,
+ vlc_thread_func_t func,
+ void *p_data )
+{
+ int i_ret;
+
+#ifdef GPROF
+ wrapper_t wrapper;
+
+ /* Initialize the wrapper structure */
+ wrapper.func = func;
+ wrapper.p_data = p_data;
+ getitimer( ITIMER_PROF, &wrapper.itimer );
+ vlc_mutex_init( &wrapper.lock );
+ vlc_cond_init( &wrapper.wait );
+ vlc_mutex_lock( &wrapper.lock );
+
+ /* Alter user-passed data so that we call the wrapper instead
+ * of the real function */
+ p_data = &wrapper;
+ func = vlc_thread_wrapper;
+#endif
+
+#if defined( PTH_INIT_IN_PTH_H )
+ *p_thread = pth_spawn( PTH_ATTR_DEFAULT, func, p_data );
+ i_ret = ( p_thread == NULL );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ i_ret = pthread_create( p_thread, NULL, func, p_data );
+
+#elif defined( HAVE_CTHREADS_H )
+ *p_thread = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
+ i_ret = 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ *p_thread = spawn_thread( (thread_func)func, psz_name,
+ B_NORMAL_PRIORITY, p_data );
+ i_ret = resume_thread( *p_thread );
+
+#elif defined( WIN32 )
+#if 0
+ DWORD threadID;
+ /* This method is not recommended when using the MSVCRT C library,
+ * so we'll have to use _beginthreadex instead */
+ *p_thread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE) func,
+ p_data, 0, &threadID);
+#endif
+ unsigned threadID;
+ /* When using the MSVCRT C library you have to use the _beginthreadex
+ * function instead of CreateThread, otherwise you'll end up with memory
+ * leaks and the signal function not working */
+ *p_thread = (HANDLE)_beginthreadex(NULL, 0, (PTHREAD_START) func,
+ p_data, 0, &threadID);
+
+ i_ret = ( *p_thread ? 0 : 1 );
+
+#endif
+
+#ifdef GPROF
+ if( i_ret == 0 )
+ {
+ vlc_cond_wait( &wrapper.wait, &wrapper.lock );
+ }
+
+ vlc_mutex_unlock( &wrapper.lock );
+ vlc_mutex_destroy( &wrapper.lock );
+ vlc_cond_destroy( &wrapper.wait );
+#endif
+
+ if( i_ret == 0 )
+ {
+ intf_WarnMsg( 2, "thread info: %d (%s) has been created (%s:%d)",
+ *p_thread, psz_name, psz_file, i_line );
+ }
+ else
+ {
+ intf_ErrMsg( "thread error: %s couldn't be created at %s:%d (%s)",
+ psz_name, psz_file, i_line, strerror(i_ret) );
+ }
+
+ return i_ret;
+}
+
+/*****************************************************************************
+ * vlc_thread_exit: terminate a thread
+ *****************************************************************************/
+static __inline__ void vlc_thread_exit( void )
+{
+#if defined( PTH_INIT_IN_PTH_H )
+ pth_exit( 0 );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ pthread_exit( 0 );
+
+#elif defined( HAVE_CTHREADS_H )
+ int result;
+ cthread_exit( &result );
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ exit_thread( 0 );
+
+#elif defined( WIN32 )
+#if 0
+ ExitThread( 0 );
+#endif
+ /* For now we don't close the thread handles (because of race conditions).
+ * Need to be looked at. */
+ _endthreadex(0);
+
+#endif
+}
+
+/*****************************************************************************
+ * vlc_thread_join: wait until a thread exits
+ *****************************************************************************/
+#ifdef DEBUG
+# define vlc_thread_join( THREAD ) \
+ _vlc_thread_join( __FILE__, __LINE__, THREAD )
+#else
+# define vlc_thread_join( THREAD ) \
+ _vlc_thread_join( NULL, 0, THREAD )
+#endif
+
+static __inline__ void _vlc_thread_join( char * psz_file, int i_line,
+ vlc_thread_t thread )
+{
+ int i_ret = 0;
+
+#if defined( PTH_INIT_IN_PTH_H )
+ i_ret = pth_join( thread, NULL );
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+ i_ret = pthread_join( thread, NULL );
+
+#elif defined( HAVE_CTHREADS_H )
+ cthread_join( thread );
+ i_ret = 1;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+ int32 exit_value;
+ wait_for_thread( thread, &exit_value );
+
+#elif defined( WIN32 )
+ WaitForSingleObject( thread, INFINITE );
+
+#endif
+
+ if( i_ret )
+ {
+ intf_ErrMsg( "thread error: thread_join(%d) failed at %s:%d (%s)",
+ thread, psz_file, i_line, strerror(i_ret) );
+ }
+ else
+ {
+ intf_WarnMsg( 2, "thread info: %d has been joined (%s:%d)",
+ thread, psz_file, i_line );
+ }
+}
+
+#ifdef GPROF
+static void *vlc_thread_wrapper( void *p_wrapper )
+{
+ /* Put user data in thread-local variables */
+ void * p_data = ((wrapper_t*)p_wrapper)->p_data;
+ vlc_thread_func_t func = ((wrapper_t*)p_wrapper)->func;
+
+ /* Set the profile timer value */
+ setitimer( ITIMER_PROF, &((wrapper_t*)p_wrapper)->itimer, NULL );
+
+ /* Tell the calling thread that we don't need its data anymore */
+ vlc_mutex_lock( &((wrapper_t*)p_wrapper)->lock );
+ vlc_cond_signal( &((wrapper_t*)p_wrapper)->wait );
+ vlc_mutex_unlock( &((wrapper_t*)p_wrapper)->lock );
+
+ /* Call the real function */
+ return func( p_data );
+}
+#endif
+
projects / vlc / blobdiff