X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads_funcs.h;h=00ae68cf0c276b5b53ff81952838fe07fd4b2071;hb=6b822f38be4f5958b1e271324bc73f4a7a98b0bc;hp=c3996b6e00baff055d2b1a613c242392e2fab63c;hpb=fb8ca39f8f3cbb4bfbcb0e103a3dfa0cc785bb84;p=vlc diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h index c3996b6e00..00ae68cf0c 100644 --- a/include/vlc_threads_funcs.h +++ b/include/vlc_threads_funcs.h @@ -2,8 +2,8 @@ * vlc_threads_funcs.h : threads implementation for the VideoLAN client * This header provides a portable threads implementation. ***************************************************************************** - * Copyright (C) 1999, 2002 VideoLAN - * $Id: vlc_threads_funcs.h,v 1.11 2002/12/18 11:47:35 sam Exp $ + * Copyright (C) 1999-2007 the VideoLAN team + * $Id$ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -22,23 +22,28 @@ * * 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_THREADFUNCS_H_ +#define _VLC_THREADFUNCS_H_ + /***************************************************************************** * Function definitions *****************************************************************************/ -VLC_EXPORT( int, __vlc_threads_init, ( vlc_object_t * ) ); -VLC_EXPORT( int, __vlc_threads_end, ( vlc_object_t * ) ); VLC_EXPORT( int, __vlc_mutex_init, ( vlc_object_t *, vlc_mutex_t * ) ); -VLC_EXPORT( int, __vlc_mutex_destroy, ( char *, int, vlc_mutex_t * ) ); +VLC_EXPORT( int, __vlc_mutex_destroy, ( const char *, int, vlc_mutex_t * ) ); VLC_EXPORT( int, __vlc_cond_init, ( vlc_object_t *, vlc_cond_t * ) ); -VLC_EXPORT( int, __vlc_cond_destroy, ( char *, int, vlc_cond_t * ) ); -VLC_EXPORT( int, __vlc_thread_create, ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), int, vlc_bool_t ) ); -VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, char *, int, int ) ); +VLC_EXPORT( int, __vlc_cond_destroy, ( const char *, int, vlc_cond_t * ) ); +VLC_EXPORT( int, __vlc_threadvar_create, (vlc_object_t *, vlc_threadvar_t * ) ); +VLC_EXPORT( int, __vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( void * ), int, vlc_bool_t ) ); +VLC_EXPORT( int, __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) ); VLC_EXPORT( void, __vlc_thread_ready, ( vlc_object_t * ) ); -VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, char *, int ) ); - +VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) ); /***************************************************************************** * vlc_threads_init: initialize threads system @@ -64,23 +69,28 @@ VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, char *, int ) ); #define vlc_mutex_lock( P_MUTEX ) \ __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX ) -static inline int __vlc_mutex_lock( char * psz_file, int i_line, +#if defined( __APPLE__ ) || defined( __FreeBSD__ ) +# define CAST_PTHREAD_TO_INT(t) (unsigned long int)(uintptr_t)(void *)t +#else +# define CAST_PTHREAD_TO_INT(t) (unsigned long int)t +#endif + +static inline int __vlc_mutex_lock( const char * psz_file, int i_line, vlc_mutex_t * p_mutex ) { int i_result; /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; + unsigned long int i_thread = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_mutex_acquire( &p_mutex->mutex, TRUE, NULL ); + i_result = ( pth_mutex_acquire( &p_mutex->mutex, FALSE, NULL ) == FALSE ); #elif defined( ST_INIT_IN_ST_H ) i_result = st_mutex_lock( p_mutex->mutex ); #elif defined( UNDER_CE ) EnterCriticalSection( &p_mutex->csection ); - return 0; + i_result = 0; #elif defined( WIN32 ) if( p_mutex->mutex ) @@ -91,19 +101,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line, { EnterCriticalSection( &p_mutex->csection ); } - return 0; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_result = pthread_mutex_lock( &p_mutex->mutex ); - if ( i_result ) - { - i_thread = (int)pthread_self(); - psz_error = strerror(i_result); - } - -#elif defined( HAVE_CTHREADS_H ) - mutex_lock( p_mutex->mutex ); - return 0; + i_result = 0; #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_mutex == NULL ) @@ -118,40 +116,59 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line, { i_result = acquire_sem( p_mutex->lock ); } + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) +# define vlc_assert_locked( m ) \ + assert (pthread_mutex_lock (&((m)->mutex)) == EDEADLK) + + i_result = pthread_mutex_lock( &p_mutex->mutex ); + if ( i_result ) + { + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); + errno = i_result; + } + +#elif defined( HAVE_CTHREADS_H ) + mutex_lock( p_mutex->mutex ); + i_result = 0; + #endif if( i_result ) { msg_Err( p_mutex->p_this, - "thread %d: mutex_lock failed at %s:%d (%d:%s)", - i_thread, psz_file, i_line, i_result, psz_error ); + "thread %li: mutex_lock failed at %s:%d (%d:%m)", + i_thread, psz_file, i_line, i_result ); } return i_result; } +#ifndef vlc_assert_locked +# define vlc_assert_locked( m ) (void)0 +#endif + /***************************************************************************** * vlc_mutex_unlock: unlock a mutex *****************************************************************************/ #define vlc_mutex_unlock( P_MUTEX ) \ __vlc_mutex_unlock( __FILE__, __LINE__, P_MUTEX ) -static inline int __vlc_mutex_unlock( char * psz_file, int i_line, +static inline int __vlc_mutex_unlock( const char * psz_file, int i_line, vlc_mutex_t *p_mutex ) { int i_result; /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; + unsigned long int i_thread = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_mutex_release( &p_mutex->mutex ); + i_result = ( pth_mutex_release( &p_mutex->mutex ) == FALSE ); #elif defined( ST_INIT_IN_ST_H ) i_result = st_mutex_unlock( p_mutex->mutex ); #elif defined( UNDER_CE ) LeaveCriticalSection( &p_mutex->csection ); - return 0; + i_result = 0; #elif defined( WIN32 ) if( p_mutex->mutex ) @@ -162,19 +179,7 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line, { LeaveCriticalSection( &p_mutex->csection ); } - return 0; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_result = pthread_mutex_unlock( &p_mutex->mutex ); - if ( i_result ) - { - i_thread = (int)pthread_self(); - psz_error = strerror(i_result); - } - -#elif defined( HAVE_CTHREADS_H ) - mutex_unlock( p_mutex ); - return 0; + i_result = 0; #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_mutex == NULL ) @@ -190,13 +195,26 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line, release_sem( p_mutex->lock ); return B_OK; } + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + i_result = pthread_mutex_unlock( &p_mutex->mutex ); + if ( i_result ) + { + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); + errno = i_result; + } + +#elif defined( HAVE_CTHREADS_H ) + mutex_unlock( p_mutex ); + i_result = 0; + #endif if( i_result ) { msg_Err( p_mutex->p_this, - "thread %d: mutex_unlock failed at %s:%d (%d:%s)", - i_thread, psz_file, i_line, i_result, psz_error ); + "thread %li: mutex_unlock failed at %s:%d (%d:%m)", + i_thread, psz_file, i_line, i_result ); } return i_result; @@ -220,23 +238,22 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line, #define vlc_cond_signal( P_COND ) \ __vlc_cond_signal( __FILE__, __LINE__, P_COND ) -static inline int __vlc_cond_signal( char * psz_file, int i_line, +static inline int __vlc_cond_signal( const char * psz_file, int i_line, vlc_cond_t *p_condvar ) { int i_result; /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; + unsigned long int i_thread = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_cond_notify( &p_condvar->cond, FALSE ); + i_result = ( pth_cond_notify( &p_condvar->cond, FALSE ) == FALSE ); #elif defined( ST_INIT_IN_ST_H ) i_result = st_cond_signal( p_condvar->cond ); #elif defined( UNDER_CE ) PulseEvent( p_condvar->event ); - return 0; + i_result = 0; #elif defined( WIN32 ) /* Release one waiting thread if one is available. */ @@ -244,6 +261,11 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line, * by a mutex. This will prevent another thread from stealing the signal */ if( !p_condvar->semaphore ) { + /* + ** 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->event ); } else if( p_condvar->i_win9x_cv == 1 ) @@ -277,23 +299,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line, WaitForSingleObject( p_condvar->event, INFINITE ); } } - return 0; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_result = pthread_cond_signal( &p_condvar->cond ); - if ( i_result ) - { - i_thread = (int)pthread_self(); - psz_error = strerror(i_result); - } - -#elif defined( HAVE_CTHREADS_H ) - /* condition_signal() */ - if ( p_condvar->queue.head || p_condvar->implications ) - { - cond_signal( (condition_t)p_condvar ); - } - return 0; + i_result = 0; #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_condvar == NULL ) @@ -331,198 +337,263 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line, } i_result = 0; } + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + i_result = pthread_cond_signal( &p_condvar->cond ); + if ( i_result ) + { + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); + errno = i_result; + } + +#elif defined( HAVE_CTHREADS_H ) + /* condition_signal() */ + if ( p_condvar->queue.head || p_condvar->implications ) + { + cond_signal( (condition_t)p_condvar ); + } + i_result = 0; + #endif if( i_result ) { msg_Err( p_condvar->p_this, - "thread %d: cond_signal failed at %s:%d (%d:%s)", - i_thread, psz_file, i_line, i_result, psz_error ); + "thread %li: cond_signal failed at %s:%d (%d:%m)", + i_thread, psz_file, i_line, i_result ); } return i_result; } /***************************************************************************** - * vlc_cond_broadcast: start all threads waiting on condition completion + * vlc_cond_wait: wait until condition completion *****************************************************************************/ -/* - * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - * Only works with pthreads, st, win32 - * You need to adapt it for others - * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - */ -#define vlc_cond_broadcast( P_COND ) \ - __vlc_cond_broadcast( __FILE__, __LINE__, P_COND ) - -static inline int __vlc_cond_broadcast( char * psz_file, int i_line, - vlc_cond_t *p_condvar ) +#define vlc_cond_wait( P_COND, P_MUTEX ) \ + __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX ) + +static inline int __vlc_cond_wait( const char * psz_file, int i_line, + vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex ) { int i_result; /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; + unsigned long int i_thread = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_cond_notify( &p_condvar->cond, FALSE ); + i_result = ( pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL ) + == FALSE ); #elif defined( ST_INIT_IN_ST_H ) - i_result = st_cond_broadcast( p_condvar->cond ); + st_mutex_unlock( p_mutex->mutex ); + i_result = st_cond_wait( p_condvar->cond ); + st_mutex_lock( p_mutex->mutex ); #elif defined( UNDER_CE ) - int i; + p_condvar->i_waiting_threads++; + LeaveCriticalSection( &p_mutex->csection ); + WaitForSingleObject( p_condvar->event, INFINITE ); + p_condvar->i_waiting_threads--; - /* Release all waiting threads. */ - for( i = p_condvar->i_waiting_threads; i > 0; i-- ) - { - PulseEvent( p_condvar->event ); - } - return 0; + /* Reacquire the mutex before returning. */ + vlc_mutex_lock( p_mutex ); -#elif defined( WIN32 ) - int i; + i_result = 0; - /* Release all waiting threads. */ +#elif defined( WIN32 ) if( !p_condvar->semaphore ) { - for( i = p_condvar->i_waiting_threads; i > 0; i-- ) + /* Increase our wait count */ + p_condvar->i_waiting_threads++; + + if( p_mutex->mutex ) { - PulseEvent( p_condvar->event ); + /* It is only possible to atomically release the mutex and + * initiate the waiting on WinNT/2K/XP. Win9x doesn't have + * SignalObjectAndWait(). */ + p_condvar->SignalObjectAndWait( p_mutex->mutex, + p_condvar->event, + INFINITE, FALSE ); + } + else + { + LeaveCriticalSection( &p_mutex->csection ); + WaitForSingleObject( p_condvar->event, INFINITE ); } + + p_condvar->i_waiting_threads--; } else if( p_condvar->i_win9x_cv == 1 ) { + int i_waiting_threads; + /* Wait for the gate to be open */ WaitForSingleObject( p_condvar->event, INFINITE ); - if( p_condvar->i_waiting_threads ) - { - /* Using a semaphore exposes us to a race condition. It is - * possible for another thread to start waiting on the semaphore - * just after we signaled it and thus steal the signal. - * We have to prevent new threads from entering the cond_wait(). */ - ResetEvent( p_condvar->event ); + /* Increase our wait count */ + p_condvar->i_waiting_threads++; - /* A semaphore is used here because Win9x doesn't have - * SignalObjectAndWait() and thus a race condition exists - * during the time we release the mutex and the time we start - * waiting on the event (more precisely, the signal can sometimes - * be missed by the waiting thread if we use PulseEvent()). */ - ReleaseSemaphore( p_condvar->semaphore, - p_condvar->i_waiting_threads, 0 ); - } + LeaveCriticalSection( &p_mutex->csection ); + WaitForSingleObject( p_condvar->semaphore, INFINITE ); + + /* Decrement and test must be atomic */ + EnterCriticalSection( &p_condvar->csection ); + + /* Decrease our wait count */ + i_waiting_threads = --p_condvar->i_waiting_threads; + + LeaveCriticalSection( &p_condvar->csection ); + + /* Reopen the gate if we were the last waiting thread */ + if( !i_waiting_threads ) + SetEvent( p_condvar->event ); } else { - if( p_condvar->i_waiting_threads ) - { - ReleaseSemaphore( p_condvar->semaphore, - p_condvar->i_waiting_threads, 0 ); + int i_waiting_threads; - /* Wait for the last thread to be awakened */ - WaitForSingleObject( p_condvar->event, INFINITE ); - } - } - return 0; + /* Increase our wait count */ + p_condvar->i_waiting_threads++; -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_result = pthread_cond_broadcast( &p_condvar->cond ); - if ( i_result ) - { - i_thread = (int)pthread_self(); - psz_error = strerror(i_result); - } + LeaveCriticalSection( &p_mutex->csection ); + WaitForSingleObject( p_condvar->semaphore, INFINITE ); -#elif defined( HAVE_CTHREADS_H ) - /* condition_signal() */ - if ( p_condvar->queue.head || p_condvar->implications ) - { - cond_signal( (condition_t)p_condvar ); + /* Decrement and test must be atomic */ + EnterCriticalSection( &p_condvar->csection ); + + /* Decrease our wait count */ + i_waiting_threads = --p_condvar->i_waiting_threads; + + LeaveCriticalSection( &p_condvar->csection ); + + /* Signal that the last waiting thread just went through */ + if( !i_waiting_threads ) + SetEvent( p_condvar->event ); } - return 0; + + /* Reacquire the mutex before returning. */ + vlc_mutex_lock( p_mutex ); + + i_result = 0; #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_condvar == NULL ) { i_result = B_BAD_VALUE; } + else if( p_mutex == NULL ) + { + i_result = B_BAD_VALUE; + } else if( p_condvar->init < 2000 ) { i_result = B_NO_INIT; } - else + + /* The p_condvar->thread var is initialized before the unlock because + * it enables to identify when the thread is interrupted beetwen the + * unlock line and the suspend_thread line */ + p_condvar->thread = find_thread( NULL ); + vlc_mutex_unlock( p_mutex ); + suspend_thread( p_condvar->thread ); + p_condvar->thread = -1; + + vlc_mutex_lock( p_mutex ); + i_result = 0; + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + +# ifdef DEBUG + /* In debug mode, timeout */ + struct timespec timeout = { + (mdate() / 1000000) + THREAD_COND_TIMEOUT, + 0 /* 1Hz precision is sufficient here :-) */ + }; + + i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, + &timeout ); + + if( i_result == ETIMEDOUT ) { - while( p_condvar->thread != -1 ) - { - thread_info info; - if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE ) - { - return 0; - } + errno = ETIMEDOUT; + msg_Dbg( p_condvar->p_this, + "thread %li: possible condition deadlock " + "at %s:%d (%m)", CAST_PTHREAD_TO_INT(pthread_self()), + psz_file, i_line ); - if( info.state != B_THREAD_SUSPENDED ) - { - /* The waiting thread is not suspended so it could - * have been interrupted beetwen the unlock and the - * suspend_thread line. That is why we sleep a little - * before retesting p_condver->thread. */ - snooze( 10000 ); - } - else - { - /* Ok, we have to wake up that thread */ - resume_thread( p_condvar->thread ); - return 0; - } - } - i_result = 0; + i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex ); } + +# else + i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex ); +# endif + + if ( i_result ) + { + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); + errno = i_result; + } + +#elif defined( HAVE_CTHREADS_H ) + condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex ); + i_result = 0; + #endif if( i_result ) { msg_Err( p_condvar->p_this, - "thread %d: cond_broadcast failed at %s:%d (%d:%s)", - i_thread, psz_file, i_line, i_result, psz_error ); + "thread %li: cond_wait failed at %s:%d (%d:%m)", + i_thread, psz_file, i_line, i_result ); } return i_result; } + /***************************************************************************** - * vlc_cond_wait: wait until condition completion + * 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_wait( P_COND, P_MUTEX ) \ - __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX ) +#define vlc_cond_timedwait( P_COND, P_MUTEX, DEADLINE ) \ + __vlc_cond_timedwait( __FILE__, __LINE__, P_COND, P_MUTEX, DEADLINE ) -static inline int __vlc_cond_wait( char * psz_file, int i_line, - vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex ) +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 ) { - int i_result; - /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; + int i_res; + unsigned long int i_thread = 0; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL ); - +# error Unimplemented #elif defined( ST_INIT_IN_ST_H ) - st_mutex_unlock( p_mutex->mutex ); - i_result = st_cond_wait( p_condvar->cond ); - st_mutex_lock( p_mutex->mutex ); - +# error Unimplemented #elif defined( UNDER_CE ) + mtime_t delay_ms = (deadline - mdate())/1000; + + DWORD result; + if( delay_ms < 0 ) + delay_ms = 0; + p_condvar->i_waiting_threads++; LeaveCriticalSection( &p_mutex->csection ); - WaitForSingleObject( p_condvar->event, INFINITE ); + result = WaitForSingleObject( p_condvar->event, delay_ms ); p_condvar->i_waiting_threads--; /* Reacquire the mutex before returning. */ vlc_mutex_lock( p_mutex ); - return 0; + i_res = (int)result; #elif defined( WIN32 ) + DWORD result; + + mtime_t delay_ms = (deadline - mdate())/1000; + if( delay_ms < 0 ) + delay_ms = 0; + if( !p_condvar->semaphore ) { /* Increase our wait count */ @@ -533,14 +604,14 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, /* It is only possible to atomically release the mutex and * initiate the waiting on WinNT/2K/XP. Win9x doesn't have * SignalObjectAndWait(). */ - p_condvar->SignalObjectAndWait( p_mutex->mutex, + result = p_condvar->SignalObjectAndWait( p_mutex->mutex, p_condvar->event, - INFINITE, FALSE ); + delay_ms, FALSE ); } else { LeaveCriticalSection( &p_mutex->csection ); - WaitForSingleObject( p_condvar->event, INFINITE ); + result = WaitForSingleObject( p_condvar->event, delay_ms ); } p_condvar->i_waiting_threads--; @@ -550,13 +621,21 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, int i_waiting_threads; /* Wait for the gate to be open */ - WaitForSingleObject( p_condvar->event, INFINITE ); + result = WaitForSingleObject( p_condvar->event, delay_ms ); /* Increase our wait count */ p_condvar->i_waiting_threads++; LeaveCriticalSection( &p_mutex->csection ); - WaitForSingleObject( p_condvar->semaphore, INFINITE ); + if( !result ) + { + /* recaculate remaining delay */ + delay_ms = (deadline - mdate())/1000; + if( delay_ms < 0 ) + delay_ms = 0; + + result = WaitForSingleObject( p_condvar->semaphore, delay_ms ); + } /* Decrement and test must be atomic */ EnterCriticalSection( &p_condvar->csection ); @@ -578,7 +657,7 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, p_condvar->i_waiting_threads++; LeaveCriticalSection( &p_mutex->csection ); - WaitForSingleObject( p_condvar->semaphore, INFINITE ); + result = WaitForSingleObject( p_condvar->semaphore, delay_ms ); /* Decrement and test must be atomic */ EnterCriticalSection( &p_condvar->csection ); @@ -596,82 +675,36 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, /* Reacquire the mutex before returning. */ vlc_mutex_lock( p_mutex ); - return 0; + i_res = (int)result; +#elif defined( HAVE_KERNEL_SCHEDULER_H ) +# error Unimplemented #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + lldiv_t d = lldiv( deadline, 1000000 ); + struct timespec ts = { d.quot, d.rem * 1000 }; -# ifdef DEBUG - /* In debug mode, timeout */ - struct timeval now; - struct timespec timeout; - - for( ; ; ) - { - gettimeofday( &now, NULL ); - timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT; - timeout.tv_nsec = now.tv_usec * 1000; - - i_result = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, - &timeout ); - - if( i_result == ETIMEDOUT ) - { - msg_Warn( p_condvar->p_this, - "thread %d: possible deadlock detected " - "in cond_wait at %s:%d (%s)", (int)pthread_self(), - psz_file, i_line, strerror(i_result) ); - } - else break; - } -# else - i_result = pthread_cond_wait( &p_condvar->cond, &p_mutex->mutex ); -# endif - - if ( i_result ) + i_res = pthread_cond_timedwait( &p_condvar->cond, &p_mutex->mutex, &ts ); + if( i_res == ETIMEDOUT ) + return ETIMEDOUT; /* this error is perfectly normal */ + else + if ( i_res ) /* other errors = bug */ { - i_thread = (int)pthread_self(); - psz_error = strerror(i_result); + i_thread = CAST_PTHREAD_TO_INT(pthread_self()); + errno = i_res; } #elif defined( HAVE_CTHREADS_H ) - condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex ); - return 0; - -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - if( p_condvar == NULL ) - { - i_result = B_BAD_VALUE; - } - else if( p_mutex == NULL ) - { - i_result = B_BAD_VALUE; - } - else if( p_condvar->init < 2000 ) - { - i_result = B_NO_INIT; - } - - /* The p_condvar->thread var is initialized before the unlock because - * it enables to identify when the thread is interrupted beetwen the - * unlock line and the suspend_thread line */ - p_condvar->thread = find_thread( NULL ); - vlc_mutex_unlock( p_mutex ); - suspend_thread( p_condvar->thread ); - p_condvar->thread = -1; - - vlc_mutex_lock( p_mutex ); - return 0; - +# error Unimplemented #endif - if( i_result ) + if( i_res ) { msg_Err( p_condvar->p_this, - "thread %d: cond_wait failed at %s:%d (%d:%s)", - i_thread, psz_file, i_line, i_result, psz_error ); + "thread %li: cond_wait failed at %s:%d (%d:%m)", + i_thread, psz_file, i_line, i_res ); } - return i_result; + return i_res; } /***************************************************************************** @@ -680,6 +713,68 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, #define vlc_cond_destroy( P_COND ) \ __vlc_cond_destroy( __FILE__, __LINE__, P_COND ) +/***************************************************************************** + * vlc_threadvar_create: create a thread-local variable + *****************************************************************************/ +#define vlc_threadvar_create( PTHIS, P_TLS ) \ + __vlc_threadvar_create( PTHIS, P_TLS ) + +/***************************************************************************** + * 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( PTH_INIT_IN_PTH_H ) + return pth_key_setdata( p_tls->handle, p_value ); +#elif defined( ST_INIT_IN_ST_H ) + return st_thread_setspecific( p_tls->handle, p_value ); +#elif defined( HAVE_KERNEL_SCHEDULER_H ) + return -1; + +#elif defined( UNDER_CE ) || defined( WIN32 ) + i_ret = ( TlsSetValue( p_tls->handle, p_value ) != 0 ); + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + i_ret = pthread_setspecific( p_tls->handle, p_value ); + +#elif defined( HAVE_CTHREADS_H ) + i_ret = cthread_setspecific( p_tls->handle, p_value ); +#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( PTH_INIT_IN_PTH_H ) + p_ret = pth_key_getdata( p_handle->key ); +#elif defined( ST_INIT_IN_ST_H ) + p_ret = st_thread_getspecific( p_handle->key ); +#elif defined( HAVE_KERNEL_SCHEDULER_H ) + p_ret = NULL; +#elif defined( UNDER_CE ) || defined( WIN32 ) + p_ret = TlsGetValue( p_tls->handle ); + +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + p_ret = pthread_getspecific( p_tls->handle ); + +#elif defined( HAVE_CTHREADS_H ) + if ( !cthread_getspecific( p_tls->handle, &p_ret ) ) + { + p_ret = NULL; + } +#endif + + return p_ret; +} + /***************************************************************************** * vlc_thread_create: create a thread *****************************************************************************/ @@ -703,3 +798,5 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, *****************************************************************************/ #define vlc_thread_join( P_THIS ) \ __vlc_thread_join( VLC_OBJECT(P_THIS), __FILE__, __LINE__ ) + +#endif