X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=31b851c62b9adc180e6406f62b7fd21371487a81;hb=c76ca6667fe719f8a7757f9b9d61fcd3cab64657;hp=5263b332aab6a27fb671741ea553064bc9e1b53d;hpb=64003608f91488015acd2341804e70033f292dc6;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 5263b332aa..31b851c62b 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -2,8 +2,8 @@ * vlc_threads.h : threads implementation for the VideoLAN client * This header provides portable declarations for mutexes & conditions ***************************************************************************** - * Copyright (C) 1999, 2002 VideoLAN - * $Id: vlc_threads.h,v 1.29 2003/02/27 08:19:02 massiot Exp $ + * Copyright (C) 1999, 2002 the VideoLAN team + * $Id$ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -14,7 +14,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -22,15 +22,20 @@ * * 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. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + +#ifndef _VLC_THREADS_H_ +#define _VLC_THREADS_H_ + #include -#if defined(GPROF) || defined(DEBUG) -# ifdef HAVE_SYS_TIME_H -# include -# endif +#if defined(DEBUG) && defined(HAVE_SYS_TIME_H) +# include #endif #if defined( PTH_INIT_IN_PTH_H ) /* GNU Pth */ @@ -44,23 +49,24 @@ #elif defined( WIN32 ) # include /* Win32 API */ +#elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */ +# include +# include +# include + #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */ +# define LIBVLC_USE_PTHREAD 1 +# define _APPLE_C_SOURCE 1 /* Proper pthread semantics on OSX */ + # include -# ifdef DEBUG - /* Needed for pthread_cond_timedwait */ -# include -# endif + /* Needed for pthread_cond_timedwait */ +# include /* 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 -#elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */ -# include -# include -# include - #else # error no threads available on your system ! @@ -71,18 +77,35 @@ *****************************************************************************/ /* Thread priorities */ -#ifdef SYS_DARWIN -# define VLC_THREAD_PRIORITY_LOW 37 +#ifdef __APPLE__ +# define VLC_THREAD_PRIORITY_LOW (-47) # define VLC_THREAD_PRIORITY_INPUT 37 # define VLC_THREAD_PRIORITY_AUDIO 37 -# define VLC_THREAD_PRIORITY_VIDEO 37 +# define VLC_THREAD_PRIORITY_VIDEO (-47) # define VLC_THREAD_PRIORITY_OUTPUT 37 +# define VLC_THREAD_PRIORITY_HIGHEST 37 + +#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(PTHREAD_COND_T_IN_PTHREAD_H) +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT 20 +# define VLC_THREAD_PRIORITY_AUDIO 10 +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT 30 +# define VLC_THREAD_PRIORITY_HIGHEST 40 #elif defined(WIN32) || defined(UNDER_CE) /* Define different priorities for WinNT/2K/XP and Win9x/Me */ # define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_INPUT \ - (IS_WINNT ? THREAD_PRIORITY_TIME_CRITICAL : 0) + (IS_WINNT ? THREAD_PRIORITY_ABOVE_NORMAL : 0) # define VLC_THREAD_PRIORITY_AUDIO \ (IS_WINNT ? THREAD_PRIORITY_HIGHEST : 0) # define VLC_THREAD_PRIORITY_VIDEO \ @@ -92,19 +115,13 @@ # define VLC_THREAD_PRIORITY_HIGHEST \ (IS_WINNT ? THREAD_PRIORITY_TIME_CRITICAL : 0) -#elif defined(SYS_BEOS) -# define VLC_THREAD_PRIORITY_LOW 5 -# define VLC_THREAD_PRIORITY_INPUT 14 -# define VLC_THREAD_PRIORITY_AUDIO 13 -# define VLC_THREAD_PRIORITY_VIDEO 11 -# define VLC_THREAD_PRIORITY_OUTPUT 12 - #else # define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_INPUT 0 # define VLC_THREAD_PRIORITY_AUDIO 0 # define VLC_THREAD_PRIORITY_VIDEO 0 # define VLC_THREAD_PRIORITY_OUTPUT 0 +# define VLC_THREAD_PRIORITY_HIGHEST 0 #endif @@ -124,6 +141,10 @@ typedef struct pth_cond_t cond; vlc_object_t * p_this; } vlc_cond_t; +typedef struct +{ + int handle; +} vlc_threadvar_t; #elif defined( ST_INIT_IN_ST_H ) typedef st_thread_t vlc_thread_t; @@ -137,11 +158,24 @@ typedef struct st_cond_t cond; vlc_object_t * p_this; } vlc_cond_t; +typedef struct +{ + int handle; +} vlc_threadvar_t; #elif defined( WIN32 ) || defined( UNDER_CE ) -typedef HANDLE vlc_thread_t; +typedef struct +{ + /* 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; + typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL ); -typedef unsigned (__stdcall *PTHREAD_START) (void *); typedef struct { @@ -167,6 +201,39 @@ typedef struct 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 we need */ + +typedef thread_id vlc_thread_t; + +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; + +typedef struct +{ +} vlc_threadvar_t; + + #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) typedef pthread_t vlc_thread_t; typedef struct @@ -180,6 +247,11 @@ typedef struct vlc_object_t * p_this; } vlc_cond_t; +typedef struct +{ + pthread_key_t handle; +} vlc_threadvar_t; + #elif defined( HAVE_CTHREADS_H ) typedef cthread_t vlc_thread_t; @@ -206,28 +278,11 @@ typedef struct vlc_object_t * p_this; } vlc_cond_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 */ - -typedef thread_id vlc_thread_t; - -typedef struct -{ - int32 init; - sem_id lock; - - vlc_object_t * p_this; -} vlc_mutex_t; - typedef struct { - int32 init; - thread_id thread; - - vlc_object_t * p_this; -} vlc_cond_t; + cthread_key_t handle; +} vlc_threadvar_t; #endif +#endif