#undef MIN
#include <kernel/OS.h>
#include <kernel/scheduler.h>
+#include <byteorder.h>
#else
#error no threads available on your system !
#endif
* Types definition
*****************************************************************************/
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_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;
#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
+ * not a real mutex and the cond_var is not like a pthread cond_var but it is
+ * enough for what wee need */
+
typedef thread_id vlc_thread_t;
typedef struct
{
int32 init;
sem_id lock;
- thread_id owner;
} vlc_mutex_t;
typedef struct
{
int32 init;
- sem_id sem;
- sem_id handshakeSem;
- sem_id signalSem;
- volatile int32 nw;
- volatile int32 ns;
+ thread_id thread;
} vlc_cond_t;
-#elif defined(HAVE_PTHREAD_H)
-
-typedef pthread_t vlc_thread_t;
-typedef pthread_mutex_t vlc_mutex_t;
-typedef pthread_cond_t vlc_cond_t;
-
#endif
typedef void *(*vlc_thread_func_t)(void *p_data);
static __inline__ void vlc_thread_exit ( void );
static __inline__ void vlc_thread_join ( vlc_thread_t thread );
-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 );
+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 );
+static __inline__ int vlc_mutex_destroy ( vlc_mutex_t *p_mutex );
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 );
+static __inline__ int vlc_cond_destroy ( vlc_cond_t *p_condvar );
#if 0
static _inline__ int vlc_cond_timedwait ( vlc_cond_t * condvar, vlc_mutex_t * mutex,
char *psz_name, vlc_thread_func_t func,
void *p_data)
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ return 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 );
return 0;
B_NORMAL_PRIORITY, p_data );
return resume_thread( *p_thread );
-#elif defined(HAVE_PTHREAD_H)
- return pthread_create( p_thread, NULL, func, p_data );
-
#endif
}
*****************************************************************************/
static __inline__ void vlc_thread_exit( void )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ pthread_exit( 0 );
+
+#elif defined(HAVE_CTHREADS_H)
int result;
cthread_exit( &result );
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
exit_thread( 0 );
-#elif defined(HAVE_PTHREAD_H)
- pthread_exit( 0 );
-
#endif
}
*****************************************************************************/
static __inline__ void vlc_thread_join( vlc_thread_t thread )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ pthread_join( thread, NULL );
+
+#elif defined(HAVE_CTHREADS_H)
cthread_join( thread );
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
int32 exit_value;
wait_for_thread( thread, &exit_value );
-#elif defined(HAVE_PTHREAD_H)
- pthread_join( thread, NULL );
-
#endif
}
-#if defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
-/* lazy_init_mutex */
-static __inline__ void lazy_init_mutex(vlc_mutex_t* p_mutex)
-{
- int32 v = atomic_or( &p_mutex->init, 1 );
- if( 2000 == v ) /* we're the first, so do the init */
- {
- vlc_mutex_init( p_mutex );
- }
- else /* we're not the first, so wait until the init is finished */
- {
- while( p_mutex->init != 9999 )
- {
- snooze( 10000 );
- }
- }
-}
-#endif
-
/*****************************************************************************
* vlc_mutex_init: initialize a mutex
*****************************************************************************/
static __inline__ int vlc_mutex_init( vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ 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)
-/*
- // check the arguments and whether it's already been initialized
- if( !p_mutex ) return B_BAD_VALUE;
- if( p_mutex->init == 9999 ) return EALREADY;
-*/
+
+ /* 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" );
- p_mutex->owner = -1;
+ 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 );
-
#endif
}
*****************************************************************************/
static __inline__ int vlc_mutex_lock( vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ return pthread_mutex_lock( p_mutex );
+
+#elif defined(HAVE_CTHREADS_H)
mutex_lock( p_mutex );
return 0;
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
status_t err;
-/*
+
if( !p_mutex ) return B_BAD_VALUE;
if( p_mutex->init < 2000 ) return B_NO_INIT;
- lazy_init_mutex( p_mutex );
-*/
err = acquire_sem( p_mutex->lock );
-/*
- if( !err ) p_mutex->owner = find_thread( NULL );
-*/
-
return err;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_mutex_lock( p_mutex );
-
#endif
}
*****************************************************************************/
static __inline__ int vlc_mutex_unlock( vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ return pthread_mutex_unlock( p_mutex );
+
+#elif defined(HAVE_CTHREADS_H)
mutex_unlock( p_mutex );
return 0;
#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
-/*
+
if(! p_mutex) return B_BAD_VALUE;
if( p_mutex->init < 2000 ) return B_NO_INIT;
- lazy_init_mutex( p_mutex );
-
- if( p_mutex->owner != find_thread(NULL) )
- return ENOLCK;
-
- p_mutex->owner = -1;
-*/
release_sem( p_mutex->lock );
return B_OK;
-#elif defined(HAVE_PTHREAD_H)
- return pthread_mutex_unlock( p_mutex );
-
#endif
}
-#if defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
-/* lazy_init_cond */
-static __inline__ void lazy_init_cond( vlc_cond_t* p_condvar )
+/*****************************************************************************
+ * vlc_mutex_destroy: destroy a mutex
+ *****************************************************************************/
+static __inline__ int vlc_mutex_destroy( vlc_mutex_t *p_mutex )
{
- int32 v = atomic_or( &p_condvar->init, 1 );
- if( 2000 == v ) /* we're the first, so do the init */
- {
- vlc_cond_init( p_condvar );
- }
- else /* we're not the first, so wait until the init is finished */
- {
- while( p_condvar->init != 9999 )
- {
- snooze( 10000 );
- }
- }
+#if defined(HAVE_PTHREAD_H)
+ return pthread_mutex_destroy( p_mutex );
+#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+ if( p_mutex->init == 9999 )
+ delete_sem( p_mutex->lock );
+ p_mutex->init = 0;
+ return B_OK;
+#endif
}
-#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(HAVE_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 );
if( p_condvar->init == 9999 )
return EALREADY;
- p_condvar->sem = create_sem( 0, "CVSem" );
- p_condvar->handshakeSem = create_sem( 0, "CVHandshake" );
- p_condvar->signalSem = create_sem( 1, "CVSignal" );
- p_condvar->ns = p_condvar->nw = 0;
+ p_condvar->thread = -1;
p_condvar->init = 9999;
- return B_OK;
-
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_init( p_condvar, NULL );
+ return 0;
#endif
}
*****************************************************************************/
static __inline__ int vlc_cond_signal( vlc_cond_t *p_condvar )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_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)
- status_t err = B_OK;
-
if( !p_condvar )
return B_BAD_VALUE;
if( p_condvar->init < 2000 )
return B_NO_INIT;
-
- lazy_init_cond( p_condvar );
-
- if( acquire_sem(p_condvar->signalSem) == B_INTERRUPTED)
- return B_INTERRUPTED;
-
- if( p_condvar->nw > p_condvar->ns )
+ while( p_condvar->thread != -1 )
{
- p_condvar->ns += 1;
- release_sem( p_condvar->sem );
- release_sem( p_condvar->signalSem );
+ thread_info info;
+ if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE )
+ return 0;
- while( acquire_sem(p_condvar->handshakeSem) == B_INTERRUPTED )
+ if( info.state != B_THREAD_SUSPENDED )
{
- err = B_INTERRUPTED;
+ // 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;
}
}
- else
- {
- release_sem( p_condvar->signalSem );
- }
- return err;
-
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_signal( p_condvar );
+ return 0;
#endif
}
*****************************************************************************/
static __inline__ int vlc_cond_wait( vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex )
{
-#if defined(HAVE_CTHREADS_H)
+#if defined(HAVE_PTHREAD_H)
+ return pthread_cond_wait( p_condvar, p_mutex );
+
+#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)
- status_t err;
-
if( !p_condvar )
return B_BAD_VALUE;
if( p_condvar->init < 2000 )
return B_NO_INIT;
- lazy_init_cond( p_condvar );
-
- if( acquire_sem(p_condvar->signalSem) == B_INTERRUPTED )
- return B_INTERRUPTED;
-
- p_condvar->nw += 1;
- release_sem( p_condvar->signalSem );
-
+ // 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 );
- err = acquire_sem( p_condvar->sem );
-
- while( acquire_sem(p_condvar->signalSem) == B_INTERRUPTED)
- {
- err = B_INTERRUPTED;
- }
-
- if( p_condvar->ns > 0 )
- {
- release_sem( p_condvar->handshakeSem );
- p_condvar->ns -= 1;
- }
- p_condvar->nw -= 1;
- release_sem( p_condvar->signalSem );
+ suspend_thread( p_condvar->thread );
+ p_condvar->thread = -1;
- while( vlc_mutex_lock(p_mutex) == B_INTERRUPTED)
- {
- err = B_INTERRUPTED;
- }
- return err;
-
-#elif defined(HAVE_PTHREAD_H)
- return pthread_cond_wait( p_condvar, p_mutex );
+ vlc_mutex_lock( p_mutex );
+ return 0;
#endif
}
+
+/*****************************************************************************
+ * vlc_cond_destroy: destroy a condition
+ *****************************************************************************/
+static __inline__ int vlc_cond_destroy( vlc_cond_t *p_condvar )
+{
+#if defined(HAVE_PTHREAD_H)
+ return pthread_cond_destroy( p_condvar );
+#elif defined(HAVE_KERNEL_SCHEDULER_H) && defined(HAVE_KERNEL_OS_H)
+ p_condvar->init = 0;
+ return 0;
+#endif
+}
projects / vlc / blobdiff