X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=7fcbf25064be9be76ab2b7bf4b6a8c400db9a4db;hb=84f5d45571d24c0b9bfde6294ee399e2028b8a32;hp=5b4483f67fb4850aa6b19662666c0437af8ef018;hpb=53a25c481599c6fe784bc866545878ff6b576527;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 5b4483f67f..7fcbf25064 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 the VideoLAN team + * Copyright (C) 1999, 2002 VLC authors and VideoLAN * Copyright © 2007-2008 Rémi Denis-Courmont * * Authors: Jean-Marc Dressler @@ -10,19 +10,19 @@ * Gildas Bazin * Christophe Massiot * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 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 - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_THREADS_H_ @@ -34,10 +34,14 @@ * */ -#if defined( UNDER_CE ) -#elif defined( WIN32 ) +#if 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 @@ -77,7 +81,7 @@ # define VLC_THREAD_PRIORITY_OUTPUT 15 # define VLC_THREAD_PRIORITY_HIGHEST 20 -#elif defined(WIN32) || defined(UNDER_CE) +#elif defined(WIN32) /* Define different priorities for WinNT/2K/XP and Win9x/Me */ # define VLC_THREAD_PRIORITY_LOW 0 # define VLC_THREAD_PRIORITY_INPUT \ @@ -90,6 +94,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 @@ -111,6 +123,7 @@ typedef pthread_mutex_t vlc_mutex_t; 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; @@ -143,21 +156,71 @@ typedef struct 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 read_wait; - vlc_cond_t write_wait; + 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 } 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 { 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; + int writer; +} vlc_rwlock_t; +#define VLC_STATIC_RWLOCK \ + { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0 } + +typedef struct vlc_threadvar *vlc_threadvar_t; +typedef struct vlc_timer *vlc_timer_t; + #endif #if defined( WIN32 ) && !defined ETIMEDOUT @@ -167,46 +230,105 @@ typedef struct vlc_timer *vlc_timer_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_init_daytime, ( 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( void, vlc_sem_init, (vlc_sem_t *, unsigned) ); -VLC_EXPORT( void, vlc_sem_destroy, (vlc_sem_t *) ); -VLC_EXPORT( int, vlc_sem_post, (vlc_sem_t *) ); -VLC_EXPORT( void, vlc_sem_wait, (vlc_sem_t *) ); - -VLC_EXPORT( void, vlc_rwlock_init, (vlc_rwlock_t *) ); -VLC_EXPORT( void, vlc_rwlock_destroy, (vlc_rwlock_t *) ); -VLC_EXPORT( void, vlc_rwlock_rdlock, (vlc_rwlock_t *) ); -VLC_EXPORT( void, vlc_rwlock_wrlock, (vlc_rwlock_t *) ); -VLC_EXPORT( void, vlc_rwlock_unlock, (vlc_rwlock_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_EXPORT( int, vlc_timer_create, (vlc_timer_t *, void (*) (void *), void *) LIBVLC_USED ); -VLC_EXPORT( void, vlc_timer_destroy, (vlc_timer_t) ); -VLC_EXPORT( void, vlc_timer_schedule, (vlc_timer_t, bool, mtime_t, mtime_t) ); -VLC_EXPORT( unsigned, vlc_timer_getoverrun, (vlc_timer_t) LIBVLC_USED ); +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 { @@ -215,9 +337,9 @@ enum { }; #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) /** @@ -271,6 +393,24 @@ struct vlc_cleanup_t vlc_cleanup_data.proc (vlc_cleanup_data.data); \ } while (0) +/* poll() with cancellation */ +static inline int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout) +{ + vlc_testcancel (); + + while (timeout > 50) + { + int val = poll (fds, nfds, timeout); + if (val != 0) + return val; + timeout -= 50; + vlc_testcancel (); + } + + return poll (fds, nfds, timeout); +} +# define poll(u,n,t) vlc_poll(u, n, t) + #endif /* LIBVLC_USE_PTHREAD_CANCEL */ static inline void vlc_cleanup_lock (void *lock) @@ -315,7 +455,7 @@ static inline void vlc_spin_destroy (vlc_spinlock_t *spin) pthread_spin_destroy (spin); } -#elif defined (WIN32) && !defined (UNDER_CE) +#elif defined (WIN32) typedef CRITICAL_SECTION vlc_spinlock_t; @@ -393,24 +533,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. @@ -438,11 +560,14 @@ enum { VLC_AVCODEC_MUTEX = 0, VLC_GCRYPT_MUTEX, VLC_XLIB_MUTEX, + VLC_MOSAIC_MUTEX, + VLC_HIGHLIGHT_MUTEX, + VLC_ATOMIC_MUTEX, /* Insert new entry HERE */ VLC_MAX_MUTEX }; -VLC_EXPORT( void, vlc_global_mutex, ( unsigned, bool ) ); +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 )