# include <process.h> /* Win32 API */
# include <errno.h>
-#elif defined( SYS_BEOS ) /* BeOS */
-# include <kernel/OS.h>
-# include <kernel/scheduler.h>
-# include <byteorder.h>
-
#else /* pthreads (like Linux & BSD) */
# define LIBVLC_USE_PTHREAD 1
# define LIBVLC_USE_PTHREAD_CANCEL 1
# define VLC_THREAD_PRIORITY_OUTPUT 22
# define VLC_THREAD_PRIORITY_HIGHEST 22
-#elif defined(SYS_BEOS)
-# define VLC_THREAD_PRIORITY_LOW 5
-# define VLC_THREAD_PRIORITY_INPUT 10
-# define VLC_THREAD_PRIORITY_AUDIO 10
-# define VLC_THREAD_PRIORITY_VIDEO 5
-# define VLC_THREAD_PRIORITY_OUTPUT 15
-# define VLC_THREAD_PRIORITY_HIGHEST 15
-
#elif defined(LIBVLC_USE_PTHREAD)
# define VLC_THREAD_PRIORITY_LOW 0
# define VLC_THREAD_PRIORITY_INPUT 10
typedef HANDLE vlc_cond_t;
typedef DWORD vlc_threadvar_t;
-#elif defined( SYS_BEOS )
-/* 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 we need */
-
-typedef thread_id vlc_thread_t;
-
-typedef struct
-{
- int32_t init;
- sem_id lock;
-} vlc_mutex_t;
-
-typedef struct
-{
- int32_t init;
- thread_id thread;
-} vlc_cond_t;
-
-typedef struct
-{
-} vlc_threadvar_t;
-
#endif
#if defined( WIN32 ) && !defined ETIMEDOUT
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( 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 * , void (*) (void *) ) );
VLC_EXPORT( void, vlc_threadvar_delete, (vlc_threadvar_t *) );
VLC_EXPORT( int, __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( vlc_object_t * ), int, bool ) );
VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) );
-VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
+VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t * ) );
VLC_EXPORT( int, vlc_clone, (vlc_thread_t *, void * (*) (void *), void *, int) );
VLC_EXPORT( void, vlc_cancel, (vlc_thread_t) );
#define vlc_mutex_lock( P_MUTEX ) \
__vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
-VLC_EXPORT(void, vlc_pthread_fatal, (const char *action, int error, const char *file, unsigned line));
+VLC_EXPORT(void, vlc_thread_fatal, (const char *action, int error, const char *function, const char *file, unsigned line));
#if defined(LIBVLC_USE_PTHREAD)
# define VLC_THREAD_ASSERT( action ) \
if (val) \
- vlc_pthread_fatal (action, val, psz_file, i_line)
+ vlc_thread_fatal (action, val, __func__, psz_file, i_line)
#else
# define VLC_THREAD_ASSERT ((void)(val))
#endif
WaitForSingleObject( *p_mutex, INFINITE );
-#elif defined( SYS_BEOS )
- acquire_sem( p_mutex->lock );
-
#endif
}
ReleaseMutex( *p_mutex );
-#elif defined( SYS_BEOS )
- release_sem( p_mutex->lock );
-
#endif
}
}
#define mutex_cleanup_push( lock ) vlc_cleanup_push (vlc_cleanup_lock, lock)
-/*****************************************************************************
- * vlc_cond_init: initialize a condition
- *****************************************************************************/
-#define vlc_cond_init( P_THIS, P_COND ) \
- __vlc_cond_init( P_COND )
-
/*****************************************************************************
* vlc_cond_signal: start a thread on condition completion
*****************************************************************************/
* as documented in http://support.microsoft.com/kb/q173260/ */
PulseEvent( *p_condvar );
-#elif defined( SYS_BEOS )
- 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
- {
- /* Ok, we have to wake up that thread */
- resume_thread( p_condvar->thread );
- }
- }
-
#endif
}
{
vlc_testcancel ();
result = SignalObjectAndWait (*p_mutex, *p_condvar, INFINITE, TRUE);
-
- /* Reacquire the mutex before returning. */
- vlc_mutex_lock( p_mutex );
}
while (result == WAIT_IO_COMPLETION);
+ /* Reacquire the mutex before returning. */
+ vlc_mutex_lock( p_mutex );
+
vlc_testcancel ();
(void)psz_file; (void)i_line;
-#elif defined( SYS_BEOS )
- /* 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 );
- p_condvar->thread = -1;
-
- vlc_mutex_lock( p_mutex );
-
#endif
}
mtime_t deadline )
{
#if defined(LIBVLC_USE_PTHREAD)
- lldiv_t d = lldiv( deadline, 1000000 );
- struct timespec ts = { d.quot, d.rem * 1000 };
+ lldiv_t d = lldiv( deadline, CLOCK_FREQ );
+ struct timespec ts = { d.quot, d.rem * (1000000000 / CLOCK_FREQ) };
int val = pthread_cond_timedwait (p_condvar, p_mutex, &ts);
if (val != ETIMEDOUT)
return val;
#elif defined( UNDER_CE )
- mtime_t delay_ms = (deadline - mdate())/1000;
+ mtime_t delay_ms = (deadline - mdate()) / (CLOCK_FREQ / 1000);
DWORD result;
if( delay_ms < 0 )
delay_ms = 0;
}
return ETIMEDOUT;
-#elif defined( SYS_BEOS )
-# error Unimplemented
-
#endif
}
#if defined(LIBVLC_USE_PTHREAD)
i_ret = pthread_setspecific( *p_tls, p_value );
-#elif defined( SYS_BEOS )
- i_ret = EINVAL;
-
#elif defined( UNDER_CE ) || defined( WIN32 )
i_ret = TlsSetValue( *p_tls, p_value ) ? EINVAL : 0;
#if defined(LIBVLC_USE_PTHREAD)
p_ret = pthread_getspecific( *p_tls );
-#elif defined( SYS_BEOS )
- p_ret = NULL;
-
#elif defined( UNDER_CE ) || defined( WIN32 )
p_ret = TlsGetValue( *p_tls );
* vlc_thread_join: wait until a thread exits
*****************************************************************************/
#define vlc_thread_join( P_THIS ) \
- __vlc_thread_join( VLC_OBJECT(P_THIS), __FILE__, __LINE__ )
+ __vlc_thread_join( VLC_OBJECT(P_THIS) )
#endif /* !_VLC_THREADS_H */