X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=71a8dbec5f025dc0678126a7d968cf29839763d0;hb=31196681e079413f491febb8eabf996f4e2b445a;hp=392db0686518510d419d3a3974c4b752caa506d5;hpb=e516ddb1ca69202f576d6e7020c9f9b2c90b8890;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 392db06865..71a8dbec5f 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -35,7 +35,7 @@ */ #if defined( UNDER_CE ) - /* WinCE API */ +# include /* WinCE API */ #elif defined( WIN32 ) # include /* Win32 API */ # include @@ -79,15 +79,14 @@ /* 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_ABOVE_NORMAL : 0) + THREAD_PRIORITY_ABOVE_NORMAL # define VLC_THREAD_PRIORITY_AUDIO \ - (IS_WINNT ? THREAD_PRIORITY_HIGHEST : 0) -# define VLC_THREAD_PRIORITY_VIDEO \ - (IS_WINNT ? 0 : THREAD_PRIORITY_BELOW_NORMAL ) + THREAD_PRIORITY_HIGHEST +# define VLC_THREAD_PRIORITY_VIDEO 0 # define VLC_THREAD_PRIORITY_OUTPUT \ - (IS_WINNT ? THREAD_PRIORITY_ABOVE_NORMAL : 0) + THREAD_PRIORITY_ABOVE_NORMAL # define VLC_THREAD_PRIORITY_HIGHEST \ - (IS_WINNT ? THREAD_PRIORITY_TIME_CRITICAL : 0) + THREAD_PRIORITY_TIME_CRITICAL #else # define VLC_THREAD_PRIORITY_LOW 0 @@ -106,18 +105,28 @@ #if defined (LIBVLC_USE_PTHREAD) 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; typedef pthread_key_t vlc_threadvar_t; -#elif defined( WIN32 ) || defined( UNDER_CE ) +#elif defined( WIN32 ) typedef struct { HANDLE handle; void *(*entry) (void *); void *data; +#if defined( UNDER_CE ) + HANDLE cancel_event; +#endif } *vlc_thread_t; -typedef HANDLE vlc_mutex_t; +typedef struct +{ + LONG initialized; + CRITICAL_SECTION mutex; +} vlc_mutex_t; +#define VLC_STATIC_MUTEX { 0, } + typedef HANDLE vlc_cond_t; typedef DWORD vlc_threadvar_t; @@ -132,12 +141,21 @@ typedef DWORD vlc_threadvar_t; *****************************************************************************/ VLC_EXPORT( int, vlc_mutex_init, ( vlc_mutex_t * ) ); VLC_EXPORT( int, vlc_mutex_init_recursive, ( vlc_mutex_t * ) ); -VLC_EXPORT( void, __vlc_mutex_destroy, ( const char *, int, 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 * ) ); +VLC_EXPORT( void, vlc_mutex_unlock, ( vlc_mutex_t * ) ); VLC_EXPORT( int, vlc_cond_init, ( vlc_cond_t * ) ); -VLC_EXPORT( void, __vlc_cond_destroy, ( const char *, int, 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_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( vlc_object_t * ), int, bool ) ); +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 ) ); VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) ); VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t * ) ); @@ -148,135 +166,15 @@ VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...)); #ifndef LIBVLC_USE_PTHREAD_CANCEL enum { - VLC_SAVE_CANCEL, - VLC_RESTORE_CANCEL, - VLC_TEST_CANCEL, VLC_DO_CANCEL, VLC_CLEANUP_PUSH, VLC_CLEANUP_POP, }; #endif -#define vlc_thread_ready vlc_object_signal - -/***************************************************************************** - * vlc_mutex_lock: lock a mutex - *****************************************************************************/ -#define vlc_mutex_lock( P_MUTEX ) \ - __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX ) - -VLC_EXPORT(void, vlc_thread_fatal, (const char *action, int error, const char *function, const char *file, unsigned line)); - -#if defined(LIBVLC_USE_PTHREAD) -# define VLC_THREAD_ASSERT( action ) \ - if (val) \ - vlc_thread_fatal (action, val, __func__, psz_file, i_line) -#else -# define VLC_THREAD_ASSERT ((void)(val)) -#endif - -static inline void __vlc_mutex_lock( const char * psz_file, int i_line, - vlc_mutex_t * p_mutex ) -{ -#if defined(LIBVLC_USE_PTHREAD) -# define vlc_assert_locked( m ) \ - assert (pthread_mutex_lock (m) == EDEADLK) - int val = pthread_mutex_lock( p_mutex ); - VLC_THREAD_ASSERT ("locking mutex"); - -#elif defined( UNDER_CE ) - (void)psz_file; (void)i_line; - - EnterCriticalSection( &p_mutex->csection ); - -#elif defined( WIN32 ) - (void)psz_file; (void)i_line; - - WaitForSingleObject( *p_mutex, INFINITE ); - -#endif -} - -#ifndef vlc_assert_locked -# define vlc_assert_locked( m ) (void)m -#endif - -/***************************************************************************** - * vlc_mutex_unlock: unlock a mutex - *****************************************************************************/ -#define vlc_mutex_unlock( P_MUTEX ) \ - __vlc_mutex_unlock( __FILE__, __LINE__, P_MUTEX ) - -static inline void __vlc_mutex_unlock( const char * psz_file, int i_line, - vlc_mutex_t *p_mutex ) -{ -#if defined(LIBVLC_USE_PTHREAD) - int val = pthread_mutex_unlock( p_mutex ); - VLC_THREAD_ASSERT ("unlocking mutex"); - -#elif defined( UNDER_CE ) - (void)psz_file; (void)i_line; - - LeaveCriticalSection( &p_mutex->csection ); - -#elif defined( WIN32 ) - (void)psz_file; (void)i_line; - - ReleaseMutex( *p_mutex ); - -#endif -} - -/***************************************************************************** - * vlc_mutex_destroy: destroy a mutex - *****************************************************************************/ -#define vlc_mutex_destroy( P_MUTEX ) \ - __vlc_mutex_destroy( __FILE__, __LINE__, P_MUTEX ) - -/** - * Save the cancellation state and disable cancellation for the calling thread. - * This function must be called before entering a piece of code that is not - * cancellation-safe. - * @return Previous cancellation state (opaque value). - */ -static inline int vlc_savecancel (void) -{ - int state; -#if defined (LIBVLC_USE_PTHREAD_CANCEL) - (void) pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); -#else - vlc_control_cancel (VLC_SAVE_CANCEL, &state); -#endif - return state; -} - -/** - * Restore the cancellation state for the calling thread. - * @param state previous state as returned by vlc_savecancel(). - * @return Nothing, always succeeds. - */ -static inline void vlc_restorecancel (int state) -{ -#if defined (LIBVLC_USE_PTHREAD_CANCEL) - (void) pthread_setcancelstate (state, NULL); -#else - vlc_control_cancel (VLC_RESTORE_CANCEL, state); -#endif -} - -/** - * Issues an explicit deferred cancellation point. - * This has no effect if thread cancellation is disabled. - * This can be called when there is a rather slow non-sleeping operation. - */ -static inline void vlc_testcancel (void) -{ -#if defined (LIBVLC_USE_PTHREAD_CANCEL) - pthread_testcancel (); -#else - vlc_control_cancel (VLC_TEST_CANCEL); -#endif -} +VLC_EXPORT( int, vlc_savecancel, (void) ); +VLC_EXPORT( void, vlc_restorecancel, (int state) ); +VLC_EXPORT( void, vlc_testcancel, (void) ); #if defined (LIBVLC_USE_PTHREAD_CANCEL) /** @@ -338,178 +236,6 @@ static inline void vlc_cleanup_lock (void *lock) } #define mutex_cleanup_push( lock ) vlc_cleanup_push (vlc_cleanup_lock, lock) -/***************************************************************************** - * vlc_cond_signal: start a thread on condition completion - *****************************************************************************/ -#define vlc_cond_signal( P_COND ) \ - __vlc_cond_signal( __FILE__, __LINE__, P_COND ) - -static inline void __vlc_cond_signal( const char * psz_file, int i_line, - vlc_cond_t *p_condvar ) -{ -#if defined(LIBVLC_USE_PTHREAD) - int val = pthread_cond_signal( p_condvar ); - VLC_THREAD_ASSERT ("signaling condition variable"); - -#elif defined( UNDER_CE ) || defined( WIN32 ) - (void)psz_file; (void)i_line; - - /* Release one waiting thread if one is available. */ - /* For this trick to work properly, the vlc_cond_signal must be surrounded - * by a mutex. This will prevent another thread from stealing the signal */ - /* PulseEvent() only works if none of the waiting threads is suspended. - * This is particularily problematic under a debug session. - * as documented in http://support.microsoft.com/kb/q173260/ */ - PulseEvent( *p_condvar ); - -#endif -} - -/***************************************************************************** - * vlc_cond_wait: wait until condition completion - *****************************************************************************/ -#define vlc_cond_wait( P_COND, P_MUTEX ) \ - __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX ) - -static inline void __vlc_cond_wait( const char * psz_file, int i_line, - vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex ) -{ -#if defined(LIBVLC_USE_PTHREAD) - int val = pthread_cond_wait( p_condvar, p_mutex ); - VLC_THREAD_ASSERT ("waiting on condition"); - -#elif defined( UNDER_CE ) - LeaveCriticalSection( &p_mutex->csection ); - WaitForSingleObject( *p_condvar, INFINITE ); - - /* Reacquire the mutex before returning. */ - vlc_mutex_lock( p_mutex ); - -#elif defined( WIN32 ) - DWORD result; - - do - { - vlc_testcancel (); - result = SignalObjectAndWait (*p_mutex, *p_condvar, INFINITE, TRUE); - } - while (result == WAIT_IO_COMPLETION); - - /* Reacquire the mutex before returning. */ - vlc_mutex_lock( p_mutex ); - - vlc_testcancel (); - - (void)psz_file; (void)i_line; - -#endif -} - - -/***************************************************************************** - * vlc_cond_timedwait: wait until condition completion or expiration - ***************************************************************************** - * Returns 0 if object signaled, an error code in case of timeout or error. - *****************************************************************************/ -#define vlc_cond_timedwait( c, m, d ) \ - __vlc_cond_timedwait( __FILE__, __LINE__, c, m, check_deadline(d) ) - -static inline int __vlc_cond_timedwait( const char * psz_file, int i_line, - vlc_cond_t *p_condvar, - vlc_mutex_t *p_mutex, - mtime_t deadline ) -{ -#if defined(LIBVLC_USE_PTHREAD) - lldiv_t d = lldiv( deadline, CLOCK_FREQ ); - struct timespec ts = { d.quot, d.rem * (1000000000 / CLOCK_FREQ) }; - - int val = pthread_cond_timedwait (p_condvar, p_mutex, &ts); - if (val != ETIMEDOUT) - VLC_THREAD_ASSERT ("timed-waiting on condition"); - return val; - -#elif defined( UNDER_CE ) - mtime_t delay_ms = (deadline - mdate()) / (CLOCK_FREQ / 1000); - DWORD result; - if( delay_ms < 0 ) - delay_ms = 0; - - LeaveCriticalSection( &p_mutex->csection ); - result = WaitForSingleObject( *p_condvar, delay_ms ); - - /* Reacquire the mutex before returning. */ - vlc_mutex_lock( p_mutex ); - - (void)psz_file; (void)i_line; - - return (result == WAIT_TIMEOUT) ? ETIMEDOUT : 0; - -#elif defined( WIN32 ) - mtime_t total; - DWORD result = WAIT_TIMEOUT; - - (void)psz_file; (void)i_line; - - vlc_testcancel (); - while ((total = (deadline - mdate ()) > 0)) - { - DWORD delay = (total > 0x7fffffff) ? 0x7fffffff : total; - result = SignalObjectAndWait( *p_mutex, *p_condvar, - delay, TRUE ); - - /* Reacquire the mutex before return/cancel. */ - vlc_mutex_lock (p_mutex); - if (result == WAIT_OBJECT_0) - return 0; /* Condition signaled! */ - vlc_testcancel (); - } - return ETIMEDOUT; - -#endif -} - -/***************************************************************************** - * vlc_cond_destroy: destroy a condition - *****************************************************************************/ -#define vlc_cond_destroy( P_COND ) \ - __vlc_cond_destroy( __FILE__, __LINE__, P_COND ) - -/***************************************************************************** - * vlc_threadvar_set: create: set the value of a thread-local variable - *****************************************************************************/ -static inline int vlc_threadvar_set( vlc_threadvar_t * p_tls, void *p_value ) -{ - int i_ret; - -#if defined(LIBVLC_USE_PTHREAD) - i_ret = pthread_setspecific( *p_tls, p_value ); - -#elif defined( UNDER_CE ) || defined( WIN32 ) - i_ret = TlsSetValue( *p_tls, p_value ) ? EINVAL : 0; - -#endif - - return i_ret; -} - -/***************************************************************************** - * vlc_threadvar_get: create: get the value of a thread-local variable - *****************************************************************************/ -static inline void* vlc_threadvar_get( vlc_threadvar_t * p_tls ) -{ - void *p_ret; - -#if defined(LIBVLC_USE_PTHREAD) - p_ret = pthread_getspecific( *p_tls ); - -#elif defined( UNDER_CE ) || defined( WIN32 ) - p_ret = TlsGetValue( *p_tls ); - -#endif - - return p_ret; -} - # if defined (_POSIX_SPIN_LOCKS) && ((_POSIX_SPIN_LOCKS - 0) > 0) typedef pthread_spinlock_t vlc_spinlock_t; @@ -554,7 +280,12 @@ typedef CRITICAL_SECTION vlc_spinlock_t; */ static inline int vlc_spin_init (vlc_spinlock_t *spin) { +#ifdef UNDER_CE + InitializeCriticalSection(spin); + return 0; +#else return !InitializeCriticalSectionAndSpinCount(spin, 4000); +#endif } /** @@ -604,13 +335,14 @@ static inline int vlc_spin_init (vlc_spinlock_t *spin) #endif static inline void barrier (void) { -#if defined (__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) +#if defined (__GNUC__) && \ + ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) __sync_synchronize (); #elif defined(__APPLE__) OSMemoryBarrier (); #elif defined(__powerpc__) asm volatile ("sync":::"memory"); -#elif defined(__i386__) +#elif 0 // defined(__i386__) /* Requires SSE2 support */ asm volatile ("mfence":::"memory"); #else vlc_spinlock_t spin; @@ -624,8 +356,8 @@ static inline void barrier (void) /***************************************************************************** * vlc_thread_create: create a thread *****************************************************************************/ -#define vlc_thread_create( P_THIS, PSZ_NAME, FUNC, PRIORITY, WAIT ) \ - __vlc_thread_create( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PSZ_NAME, FUNC, PRIORITY, WAIT ) +#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 @@ -639,4 +371,27 @@ static inline void barrier (void) #define vlc_thread_join( P_THIS ) \ __vlc_thread_join( VLC_OBJECT(P_THIS) ) +#ifdef __cplusplus +/** + * Helper C++ class to lock a mutex. + * The mutex is locked when the object is created, and unlocked when the object + * is destroyed. + */ +class vlc_mutex_locker +{ + private: + vlc_mutex_t *lock; + public: + vlc_mutex_locker (vlc_mutex_t *m) : lock (m) + { + vlc_mutex_lock (lock); + } + + ~vlc_mutex_locker (void) + { + vlc_mutex_unlock (lock); + } +}; +#endif + #endif /* !_VLC_THREADS_H */