Commit cce79ee5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove old BeOS thread support

parent b4329926
...@@ -855,7 +855,7 @@ AC_EGREP_HEADER(timespec,sys/time.h,[ ...@@ -855,7 +855,7 @@ AC_EGREP_HEADER(timespec,sys/time.h,[
dnl Check for threads library dnl Check for threads library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(pthread.h kernel/scheduler.h kernel/OS.h) AC_CHECK_HEADERS(pthread.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Find where are the X headers and libraries dnl Find where are the X headers and libraries
......
...@@ -40,11 +40,6 @@ ...@@ -40,11 +40,6 @@
# include <process.h> /* Win32 API */ # include <process.h> /* Win32 API */
# include <errno.h> # include <errno.h>
#elif defined( SYS_BEOS ) /* BeOS */
# include <kernel/OS.h>
# include <kernel/scheduler.h>
# include <byteorder.h>
#else /* pthreads (like Linux & BSD) */ #else /* pthreads (like Linux & BSD) */
# define LIBVLC_USE_PTHREAD 1 # define LIBVLC_USE_PTHREAD 1
# define LIBVLC_USE_PTHREAD_CANCEL 1 # define LIBVLC_USE_PTHREAD_CANCEL 1
...@@ -72,14 +67,6 @@ ...@@ -72,14 +67,6 @@
# define VLC_THREAD_PRIORITY_OUTPUT 22 # define VLC_THREAD_PRIORITY_OUTPUT 22
# define VLC_THREAD_PRIORITY_HIGHEST 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) #elif defined(LIBVLC_USE_PTHREAD)
# define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_LOW 0
# define VLC_THREAD_PRIORITY_INPUT 10 # define VLC_THREAD_PRIORITY_INPUT 10
...@@ -134,29 +121,6 @@ typedef HANDLE vlc_mutex_t; ...@@ -134,29 +121,6 @@ typedef HANDLE vlc_mutex_t;
typedef HANDLE vlc_cond_t; typedef HANDLE vlc_cond_t;
typedef DWORD vlc_threadvar_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 #endif
#if defined( WIN32 ) && !defined ETIMEDOUT #if defined( WIN32 ) && !defined ETIMEDOUT
...@@ -230,9 +194,6 @@ static inline void __vlc_mutex_lock( const char * psz_file, int i_line, ...@@ -230,9 +194,6 @@ static inline void __vlc_mutex_lock( const char * psz_file, int i_line,
WaitForSingleObject( *p_mutex, INFINITE ); WaitForSingleObject( *p_mutex, INFINITE );
#elif defined( SYS_BEOS )
acquire_sem( p_mutex->lock );
#endif #endif
} }
...@@ -263,9 +224,6 @@ static inline void __vlc_mutex_unlock( const char * psz_file, int i_line, ...@@ -263,9 +224,6 @@ static inline void __vlc_mutex_unlock( const char * psz_file, int i_line,
ReleaseMutex( *p_mutex ); ReleaseMutex( *p_mutex );
#elif defined( SYS_BEOS )
release_sem( p_mutex->lock );
#endif #endif
} }
...@@ -410,28 +368,6 @@ static inline void __vlc_cond_signal( const char * psz_file, int i_line, ...@@ -410,28 +368,6 @@ static inline void __vlc_cond_signal( const char * psz_file, int i_line,
* as documented in http://support.microsoft.com/kb/q173260/ */ * as documented in http://support.microsoft.com/kb/q173260/ */
PulseEvent( *p_condvar ); 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 #endif
} }
...@@ -472,17 +408,6 @@ static inline void __vlc_cond_wait( const char * psz_file, int i_line, ...@@ -472,17 +408,6 @@ static inline void __vlc_cond_wait( const char * psz_file, int i_line,
(void)psz_file; (void)i_line; (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 #endif
} }
...@@ -546,9 +471,6 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, ...@@ -546,9 +471,6 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
} }
return ETIMEDOUT; return ETIMEDOUT;
#elif defined( SYS_BEOS )
# error Unimplemented
#endif #endif
} }
...@@ -568,9 +490,6 @@ static inline int vlc_threadvar_set( vlc_threadvar_t * p_tls, void *p_value ) ...@@ -568,9 +490,6 @@ static inline int vlc_threadvar_set( vlc_threadvar_t * p_tls, void *p_value )
#if defined(LIBVLC_USE_PTHREAD) #if defined(LIBVLC_USE_PTHREAD)
i_ret = pthread_setspecific( *p_tls, p_value ); i_ret = pthread_setspecific( *p_tls, p_value );
#elif defined( SYS_BEOS )
i_ret = EINVAL;
#elif defined( UNDER_CE ) || defined( WIN32 ) #elif defined( UNDER_CE ) || defined( WIN32 )
i_ret = TlsSetValue( *p_tls, p_value ) ? EINVAL : 0; i_ret = TlsSetValue( *p_tls, p_value ) ? EINVAL : 0;
...@@ -589,9 +508,6 @@ static inline void* vlc_threadvar_get( vlc_threadvar_t * p_tls ) ...@@ -589,9 +508,6 @@ static inline void* vlc_threadvar_get( vlc_threadvar_t * p_tls )
#if defined(LIBVLC_USE_PTHREAD) #if defined(LIBVLC_USE_PTHREAD)
p_ret = pthread_getspecific( *p_tls ); p_ret = pthread_getspecific( *p_tls );
#elif defined( SYS_BEOS )
p_ret = NULL;
#elif defined( UNDER_CE ) || defined( WIN32 ) #elif defined( UNDER_CE ) || defined( WIN32 )
p_ret = TlsGetValue( *p_tls ); p_ret = TlsGetValue( *p_tls );
......
...@@ -266,27 +266,6 @@ int vlc_mutex_init( vlc_mutex_t *p_mutex ) ...@@ -266,27 +266,6 @@ int vlc_mutex_init( vlc_mutex_t *p_mutex )
*p_mutex = CreateMutex( 0, FALSE, 0 ); *p_mutex = CreateMutex( 0, FALSE, 0 );
return (*p_mutex != NULL) ? 0 : ENOMEM; return (*p_mutex != NULL) ? 0 : ENOMEM;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
/* 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;
#endif #endif
} }
...@@ -337,12 +316,6 @@ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mute ...@@ -337,12 +316,6 @@ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mute
CloseHandle( *p_mutex ); CloseHandle( *p_mutex );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
if( p_mutex->init == 9999 )
delete_sem( p_mutex->lock );
p_mutex->init = 0;
#endif #endif
} }
...@@ -380,21 +353,6 @@ int __vlc_cond_init( vlc_cond_t *p_condvar ) ...@@ -380,21 +353,6 @@ int __vlc_cond_init( vlc_cond_t *p_condvar )
NULL ); /* unnamed */ NULL ); /* unnamed */
return *p_condvar ? 0 : ENOMEM; return *p_condvar ? 0 : ENOMEM;
#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;
#endif #endif
} }
...@@ -412,9 +370,6 @@ void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condva ...@@ -412,9 +370,6 @@ void __vlc_cond_destroy( const char * psz_file, int i_line, vlc_cond_t *p_condva
CloseHandle( *p_condvar ); CloseHandle( *p_condvar );
#elif defined( HAVE_KERNEL_SCHEDULER_H )
p_condvar->init = 0;
#endif #endif
} }
...@@ -567,10 +522,6 @@ int vlc_clone (vlc_thread_t *p_handle, void * (*entry) (void *), void *data, ...@@ -567,10 +522,6 @@ int vlc_clone (vlc_thread_t *p_handle, void * (*entry) (void *), void *data,
free (th); free (th);
} }
#elif defined( HAVE_KERNEL_SCHEDULER_H )
*p_handle = spawn_thread( entry, psz_name, priority, data );
ret = resume_thread( *p_handle );
#endif #endif
return ret; return ret;
} }
...@@ -629,12 +580,6 @@ void vlc_join (vlc_thread_t handle, void **result) ...@@ -629,12 +580,6 @@ void vlc_join (vlc_thread_t handle, void **result)
*result = handle->data; *result = handle->data;
free (handle); free (handle);
#elif defined( HAVE_KERNEL_SCHEDULER_H )
int32_t exit_value;
int val = (B_OK == wait_for_thread( p_priv->thread_id, &exit_value ));
if( !val && result )
*result = (void *)exit_value;
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment