X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=0575523a1141c65c645e5a489554fe259a68bd78;hb=98ad3f3cb54dba78cb1b5d2f5d84052b5274c430;hp=7ccafbbafce2890e507139c7ddee0bb4348df89e;hpb=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 7ccafbbafc..0575523a11 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -35,22 +35,29 @@ */ #if defined( UNDER_CE ) -# include /* WinCE API */ #elif defined( WIN32 ) # include /* Win32 API */ + +#elif defined( __OS2__ ) /* OS/2 API */ # include +# define pthread_sigmask sigprocmask + #else /* pthreads (like Linux & BSD) */ # define LIBVLC_USE_PTHREAD 1 # define LIBVLC_USE_PTHREAD_CANCEL 1 # define _APPLE_C_SOURCE 1 /* Proper pthread semantics on OSX */ -# include /* lldiv_t definition (only in C99) */ # include /* _POSIX_SPIN_LOCKS */ # include - /* Needed for pthread_cond_timedwait */ -# include -# include + +/* Unnamed POSIX semaphores not supported on Mac OS X, use Mach semaphores instead */ +# if defined (__APPLE__) +# include +# include +# else +# include +# endif #endif @@ -88,6 +95,14 @@ # define VLC_THREAD_PRIORITY_HIGHEST \ THREAD_PRIORITY_TIME_CRITICAL +#elif defined(__OS2__) +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT MAKESHORT( PRTYD_MAXIMUM / 2, PRTYC_REGULAR ) +# define VLC_THREAD_PRIORITY_AUDIO MAKESHORT( PRTYD_MAXIMUM, PRTYC_REGULAR ) +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT MAKESHORT( PRTYD_MAXIMUM / 2, PRTYC_REGULAR ) +# define VLC_THREAD_PRIORITY_HIGHEST MAKESHORT( 0, PRTYC_TIMECRITICAL ) + #else # define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_INPUT 0 @@ -107,28 +122,107 @@ typedef pthread_t vlc_thread_t; typedef pthread_mutex_t vlc_mutex_t; #define VLC_STATIC_MUTEX PTHREAD_MUTEX_INITIALIZER typedef pthread_cond_t vlc_cond_t; +#define VLC_STATIC_COND PTHREAD_COND_INITIALIZER +typedef pthread_rwlock_t vlc_rwlock_t; +#define VLC_STATIC_RWLOCK PTHREAD_RWLOCK_INITIALIZER typedef pthread_key_t vlc_threadvar_t; +typedef struct vlc_timer *vlc_timer_t; + +#if defined (__APPLE__) +typedef semaphore_t vlc_sem_t; +#else +typedef sem_t vlc_sem_t; +#endif #elif defined( WIN32 ) +typedef struct vlc_thread *vlc_thread_t; + typedef struct { - HANDLE handle; - void *(*entry) (void *); - void *data; -#if defined( UNDER_CE ) - HANDLE cancel_event; -#endif -} *vlc_thread_t; + bool dynamic; + union + { + struct + { + bool locked; + unsigned long contention; + }; + CRITICAL_SECTION mutex; + }; +} vlc_mutex_t; +#define VLC_STATIC_MUTEX { false, { { false, 0 } } } typedef struct { - LONG initialized; - CRITICAL_SECTION mutex; + HANDLE handle; + unsigned clock; +} vlc_cond_t; +#define VLC_STATIC_COND { 0, 0 } + +typedef HANDLE vlc_sem_t; + +typedef struct +{ + vlc_mutex_t mutex; + vlc_cond_t wait; + unsigned long readers; + unsigned long writers; + DWORD writer; +} vlc_rwlock_t; +#define VLC_STATIC_RWLOCK \ + { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0, 0 } + +typedef struct vlc_threadvar *vlc_threadvar_t; +typedef struct vlc_timer *vlc_timer_t; + +#elif defined( __OS2__ ) +typedef struct vlc_thread *vlc_thread_t; + +typedef struct +{ + bool dynamic; + union + { + struct + { + bool locked; + unsigned long contention; + }; + HMTX hmtx; + }; } vlc_mutex_t; -#define VLC_STATIC_MUTEX { 0, } -typedef HANDLE vlc_cond_t; -typedef DWORD vlc_threadvar_t; +#define VLC_STATIC_MUTEX { false, { { false, 0 } } } + +typedef struct +{ + HEV hev; + unsigned clock; +} vlc_cond_t; + +#define VLC_STATIC_COND { 0, 0 } + +typedef struct +{ + HEV hev; + HMTX wait_mutex; + HMTX count_mutex; + int count; +} vlc_sem_t; + +typedef struct +{ + vlc_mutex_t mutex; + vlc_cond_t wait; + unsigned long readers; + unsigned long writers; + int writer; +} vlc_rwlock_t; +#define VLC_STATIC_RWLOCK \ + { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0, 0 } + +typedef struct vlc_threadvar *vlc_threadvar_t; +typedef struct vlc_timer *vlc_timer_t; #endif @@ -139,42 +233,116 @@ typedef DWORD vlc_threadvar_t; /***************************************************************************** * Function definitions *****************************************************************************/ -VLC_EXPORT( void, vlc_mutex_init, ( vlc_mutex_t * ) ); -VLC_EXPORT( void, vlc_mutex_init_recursive, ( vlc_mutex_t * ) ); -VLC_EXPORT( void, vlc_mutex_destroy, ( vlc_mutex_t * ) ); -VLC_EXPORT( void, vlc_mutex_lock, ( vlc_mutex_t * ) ); -VLC_EXPORT( int, vlc_mutex_trylock, ( vlc_mutex_t * ) LIBVLC_USED ); -VLC_EXPORT( void, vlc_mutex_unlock, ( vlc_mutex_t * ) ); -VLC_EXPORT( void, vlc_cond_init, ( vlc_cond_t * ) ); -VLC_EXPORT( void, vlc_cond_destroy, ( vlc_cond_t * ) ); -VLC_EXPORT( void, vlc_cond_signal, (vlc_cond_t *) ); -VLC_EXPORT( void, vlc_cond_broadcast, (vlc_cond_t *) ); -VLC_EXPORT( void, vlc_cond_wait, (vlc_cond_t *, vlc_mutex_t *) ); -VLC_EXPORT( int, vlc_cond_timedwait, (vlc_cond_t *, vlc_mutex_t *, mtime_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_threadvar_set, (vlc_threadvar_t, void *) ); -VLC_EXPORT( void *, vlc_threadvar_get, (vlc_threadvar_t) ); -VLC_EXPORT( int, vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( vlc_object_t * ), int ) LIBVLC_USED ); -VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) ); -VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t * ) ); - -VLC_EXPORT( int, vlc_clone, (vlc_thread_t *, void * (*) (void *), void *, int) LIBVLC_USED ); -VLC_EXPORT( void, vlc_cancel, (vlc_thread_t) ); -VLC_EXPORT( void, vlc_join, (vlc_thread_t, void **) ); -VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...)); +VLC_API void vlc_mutex_init( vlc_mutex_t * ); +VLC_API void vlc_mutex_init_recursive( vlc_mutex_t * ); +VLC_API void vlc_mutex_destroy( vlc_mutex_t * ); +VLC_API void vlc_mutex_lock( vlc_mutex_t * ); +VLC_API int vlc_mutex_trylock( vlc_mutex_t * ) VLC_USED; +VLC_API void vlc_mutex_unlock( vlc_mutex_t * ); +VLC_API void vlc_cond_init( vlc_cond_t * ); +VLC_API void vlc_cond_init_daytime( vlc_cond_t * ); +VLC_API void vlc_cond_destroy( vlc_cond_t * ); +VLC_API void vlc_cond_signal(vlc_cond_t *); +VLC_API void vlc_cond_broadcast(vlc_cond_t *); +VLC_API void vlc_cond_wait(vlc_cond_t *, vlc_mutex_t *); +VLC_API int vlc_cond_timedwait(vlc_cond_t *, vlc_mutex_t *, mtime_t); +VLC_API void vlc_sem_init(vlc_sem_t *, unsigned); +VLC_API void vlc_sem_destroy(vlc_sem_t *); +VLC_API int vlc_sem_post(vlc_sem_t *); +VLC_API void vlc_sem_wait(vlc_sem_t *); + +VLC_API void vlc_rwlock_init(vlc_rwlock_t *); +VLC_API void vlc_rwlock_destroy(vlc_rwlock_t *); +VLC_API void vlc_rwlock_rdlock(vlc_rwlock_t *); +VLC_API void vlc_rwlock_wrlock(vlc_rwlock_t *); +VLC_API void vlc_rwlock_unlock(vlc_rwlock_t *); +VLC_API int vlc_threadvar_create(vlc_threadvar_t * , void (*) (void *) ); +VLC_API void vlc_threadvar_delete(vlc_threadvar_t *); +VLC_API int vlc_threadvar_set(vlc_threadvar_t, void *); +VLC_API void * vlc_threadvar_get(vlc_threadvar_t); + +VLC_API int vlc_clone(vlc_thread_t *, void * (*) (void *), void *, int) VLC_USED; +VLC_API void vlc_cancel(vlc_thread_t); +VLC_API void vlc_join(vlc_thread_t, void **); +VLC_API void vlc_control_cancel (int cmd, ...); + +VLC_API mtime_t mdate(void); +VLC_API void mwait(mtime_t deadline); +VLC_API void msleep(mtime_t delay); + +#define VLC_HARD_MIN_SLEEP 10000 /* 10 milliseconds = 1 tick at 100Hz */ +#define VLC_SOFT_MIN_SLEEP 9000000 /* 9 seconds */ + +#if VLC_GCC_VERSION(4,3) +/* Linux has 100, 250, 300 or 1000Hz + * + * HZ=100 by default on FreeBSD, but some architectures use a 1000Hz timer + */ + +static +__attribute__((unused)) +__attribute__((noinline)) +__attribute__((error("sorry, cannot sleep for such short a time"))) +mtime_t impossible_delay( mtime_t delay ) +{ + (void) delay; + return VLC_HARD_MIN_SLEEP; +} + +static +__attribute__((unused)) +__attribute__((noinline)) +__attribute__((warning("use proper event handling instead of short delay"))) +mtime_t harmful_delay( mtime_t delay ) +{ + return delay; +} + +# define check_delay( d ) \ + ((__builtin_constant_p(d < VLC_HARD_MIN_SLEEP) \ + && (d < VLC_HARD_MIN_SLEEP)) \ + ? impossible_delay(d) \ + : ((__builtin_constant_p(d < VLC_SOFT_MIN_SLEEP) \ + && (d < VLC_SOFT_MIN_SLEEP)) \ + ? harmful_delay(d) \ + : d)) + +static +__attribute__((unused)) +__attribute__((noinline)) +__attribute__((error("deadlines can not be constant"))) +mtime_t impossible_deadline( mtime_t deadline ) +{ + return deadline; +} + +# define check_deadline( d ) \ + (__builtin_constant_p(d) ? impossible_deadline(d) : d) +#else +# define check_delay(d) (d) +# define check_deadline(d) (d) +#endif + +#define msleep(d) msleep(check_delay(d)) +#define mwait(d) mwait(check_deadline(d)) + +VLC_API int vlc_timer_create(vlc_timer_t *, void (*) (void *), void *) VLC_USED; +VLC_API void vlc_timer_destroy(vlc_timer_t); +VLC_API void vlc_timer_schedule(vlc_timer_t, bool, mtime_t, mtime_t); +VLC_API unsigned vlc_timer_getoverrun(vlc_timer_t) VLC_USED; + +VLC_API unsigned vlc_GetCPUCount(void); #ifndef LIBVLC_USE_PTHREAD_CANCEL enum { - VLC_DO_CANCEL, VLC_CLEANUP_PUSH, VLC_CLEANUP_POP, }; #endif -VLC_EXPORT( int, vlc_savecancel, (void) ); -VLC_EXPORT( void, vlc_restorecancel, (int state) ); -VLC_EXPORT( void, vlc_testcancel, (void) ); +VLC_API int vlc_savecancel(void); +VLC_API void vlc_restorecancel(int state); +VLC_API void vlc_testcancel(void); #if defined (LIBVLC_USE_PTHREAD_CANCEL) /** @@ -212,7 +380,7 @@ struct vlc_cleanup_t }; /* This macros opens a code block on purpose. This is needed for multiple - * calls within a single function. This also prevent Win32 developpers from + * calls within a single function. This also prevent Win32 developers from * writing code that would break on POSIX (POSIX opens a block as well). */ # define vlc_cleanup_push( routine, arg ) \ do { \ @@ -350,24 +518,6 @@ static inline void barrier (void) #endif } -/***************************************************************************** - * vlc_thread_create: create a thread - *****************************************************************************/ -#define vlc_thread_create( P_THIS, PSZ_NAME, FUNC, PRIORITY ) \ - vlc_thread_create( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PSZ_NAME, FUNC, PRIORITY ) - -/***************************************************************************** - * vlc_thread_set_priority: set the priority of the calling thread - *****************************************************************************/ -#define vlc_thread_set_priority( P_THIS, PRIORITY ) \ - __vlc_thread_set_priority( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PRIORITY ) - -/***************************************************************************** - * vlc_thread_join: wait until a thread exits - *****************************************************************************/ -#define vlc_thread_join( P_THIS ) \ - __vlc_thread_join( VLC_OBJECT(P_THIS) ) - #ifdef __cplusplus /** * Helper C++ class to lock a mutex. @@ -391,4 +541,18 @@ class vlc_mutex_locker }; #endif +enum { + VLC_AVCODEC_MUTEX = 0, + VLC_GCRYPT_MUTEX, + VLC_XLIB_MUTEX, + VLC_MOSAIC_MUTEX, + VLC_HIGHLIGHT_MUTEX, + /* Insert new entry HERE */ + VLC_MAX_MUTEX +}; + +VLC_API void vlc_global_mutex( unsigned, bool ); +#define vlc_global_lock( n ) vlc_global_mutex( n, true ) +#define vlc_global_unlock( n ) vlc_global_mutex( n, false ) + #endif /* !_VLC_THREADS_H */