X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=e35ce880936754e2fb1d40832f0be2b1e1439f56;hb=0a7044077201ff47826bbf1f9bb596aff827a97f;hp=26c445b0988eaaa7d90a0ce74c838caf31210556;hpb=e85f8602c8f8ab882fb8449b48539e733377dc6f;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 26c445b098..e35ce88093 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -2,7 +2,7 @@ * vlc_threads.h : threads implementation for the VideoLAN client * This header provides portable declarations for mutexes & conditions ***************************************************************************** - * Copyright (C) 1999, 2002 VideoLAN + * Copyright (C) 1999, 2002 the VideoLAN team * $Id$ * * Authors: Jean-Marc Dressler @@ -22,22 +22,19 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include - -#if defined(DEBUG) && defined(HAVE_SYS_TIME_H) -# include +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file #endif -#if defined( PTH_INIT_IN_PTH_H ) /* GNU Pth */ -# include +#ifndef _VLC_THREADS_H_ +#define _VLC_THREADS_H_ -#elif defined( ST_INIT_IN_ST_H ) /* State threads */ -# include +#include -#elif defined( UNDER_CE ) +#if defined( UNDER_CE ) /* WinCE API */ #elif defined( WIN32 ) # include /* Win32 API */ @@ -47,20 +44,15 @@ # include # include -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */ -# include -# ifdef DEBUG - /* Needed for pthread_cond_timedwait */ -# include -# endif - /* 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 +#else /* pthreads (like Linux & BSD) */ +# define LIBVLC_USE_PTHREAD 1 +# define _APPLE_C_SOURCE 1 /* Proper pthread semantics on OSX */ -#else -# error no threads available on your system ! +# include /* _POSIX_SPIN_LOCKS */ +# include + /* Needed for pthread_cond_timedwait */ +# include +# include #endif @@ -69,7 +61,7 @@ *****************************************************************************/ /* Thread priorities */ -#ifdef SYS_DARWIN +#ifdef __APPLE__ # define VLC_THREAD_PRIORITY_LOW (-47) # define VLC_THREAD_PRIORITY_INPUT 37 # define VLC_THREAD_PRIORITY_AUDIO 37 @@ -85,7 +77,7 @@ # define VLC_THREAD_PRIORITY_OUTPUT 15 # define VLC_THREAD_PRIORITY_HIGHEST 15 -#elif defined(PTHREAD_COND_T_IN_PTHREAD_H) +#elif defined(LIBVLC_USE_PTHREAD) # define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_INPUT 20 # define VLC_THREAD_PRIORITY_AUDIO 10 @@ -121,36 +113,19 @@ * Type definitions *****************************************************************************/ -#if defined( PTH_INIT_IN_PTH_H ) -typedef pth_t vlc_thread_t; -typedef struct -{ - pth_mutex_t mutex; - vlc_object_t * p_this; -} vlc_mutex_t; +#if defined( WIN32 ) || defined( UNDER_CE ) typedef struct { - pth_cond_t cond; - vlc_object_t * p_this; -} vlc_cond_t; + /* thread id */ + DWORD id; + /* + ** handle to created thread, needs be closed to dispose of it + ** even after thread has exited + */ + HANDLE hThread; +} vlc_thread_t; -#elif defined( ST_INIT_IN_ST_H ) -typedef st_thread_t vlc_thread_t; -typedef struct -{ - st_mutex_t mutex; - vlc_object_t * p_this; -} vlc_mutex_t; -typedef struct -{ - st_cond_t cond; - vlc_object_t * p_this; -} vlc_cond_t; - -#elif defined( WIN32 ) || defined( UNDER_CE ) -typedef HANDLE vlc_thread_t; typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL ); -typedef unsigned (WINAPI *PTHREAD_START) (void *); typedef struct { @@ -158,8 +133,6 @@ typedef struct HANDLE mutex; /* Win95/98/ME implementation */ CRITICAL_SECTION csection; - - vlc_object_t * p_this; } vlc_mutex_t; typedef struct @@ -172,14 +145,17 @@ typedef struct HANDLE semaphore; CRITICAL_SECTION csection; int i_win9x_cv; - - vlc_object_t * p_this; } vlc_cond_t; +typedef struct +{ + DWORD handle; +} vlc_threadvar_t; + #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 */ + * enough for what we need */ typedef thread_id vlc_thread_t; @@ -187,56 +163,35 @@ typedef struct { int32_t init; sem_id lock; - - vlc_object_t * p_this; } vlc_mutex_t; typedef struct { int32_t init; thread_id thread; - - vlc_object_t * p_this; } vlc_cond_t; -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) +typedef struct +{ +} vlc_threadvar_t; + + +#else typedef pthread_t vlc_thread_t; typedef struct { pthread_mutex_t mutex; - vlc_object_t * p_this; } vlc_mutex_t; typedef struct { pthread_cond_t cond; - vlc_object_t * p_this; } 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 - * to handle (&foo) where foo is a (mutex_t) while they handle (foo) where - * foo is a (mutex_t*) */ typedef struct { - spin_lock_t held; - spin_lock_t lock; - char *name; - struct cthread_queue queue; - - vlc_object_t * p_this; -} vlc_mutex_t; - -typedef struct -{ - spin_lock_t lock; - struct cthread_queue queue; - char *name; - struct cond_imp *implications; - - vlc_object_t * p_this; -} vlc_cond_t; + pthread_key_t handle; +} vlc_threadvar_t; #endif +#endif /* !_VLC_THREADS_H */