X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads_funcs.h;h=ea83856f0f39f6af70be863fa18a592ce1315fd8;hb=d0f2c33c0c6bc59f226a52f18a5a415c24dc4938;hp=ebfb43e15c8236428e08954db133a7fa20c95ef9;hpb=8450492c0fe1d331db58d0acd15561f3bf7ecd63;p=vlc diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h index ebfb43e15c..ea83856f0f 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.12 2003/01/16 09:02:46 sam Exp $ + * Copyright (C) 1999, 2002 the VideoLAN team + * $Id$ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -22,7 +22,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -64,7 +64,7 @@ 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, +static inline int __vlc_mutex_lock( const char * psz_file, int i_line, vlc_mutex_t * p_mutex ) { int i_result; @@ -73,7 +73,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line, const char * psz_error = ""; #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 ); @@ -93,18 +93,6 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line, } i_result = 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 ); - i_result = 0; - #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_mutex == NULL ) { @@ -118,12 +106,25 @@ 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 ) + 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 ); + i_result = 0; + #endif if( i_result ) { msg_Err( p_mutex->p_this, - "thread %d: mutex_lock failed at %s:%d (%d:%s)", + "thread %u: mutex_lock failed at %s:%d (%d:%s)", i_thread, psz_file, i_line, i_result, psz_error ); } return i_result; @@ -135,7 +136,7 @@ static inline int __vlc_mutex_lock( char * psz_file, int i_line, #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; @@ -144,7 +145,7 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line, const char * psz_error = ""; #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 ); @@ -164,18 +165,6 @@ static inline int __vlc_mutex_unlock( char * psz_file, int i_line, } i_result = 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 ); - i_result = 0; - #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_mutex == NULL ) { @@ -190,12 +179,25 @@ 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 = (int)pthread_self(); + psz_error = strerror(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)", + "thread %u: mutex_unlock failed at %s:%d (%d:%s)", i_thread, psz_file, i_line, i_result, psz_error ); } @@ -220,7 +222,7 @@ 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; @@ -229,7 +231,7 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line, const char * psz_error = ""; #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 ); @@ -279,22 +281,6 @@ 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 = (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 ); - } - i_result = 0; - #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_condvar == NULL ) { @@ -331,102 +317,9 @@ static inline int __vlc_cond_signal( char * psz_file, int i_line, } 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 ); - } - - return i_result; -} - -/***************************************************************************** - * vlc_cond_broadcast: start all threads waiting on 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 ) -{ - int i_result; - /* In case of error : */ - int i_thread = -1; - const char * psz_error = ""; - -#if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_cond_notify( &p_condvar->cond, FALSE ); - -#elif defined( ST_INIT_IN_ST_H ) - i_result = st_cond_broadcast( p_condvar->cond ); - -#elif defined( UNDER_CE ) - int i; - - /* Release all waiting threads. */ - for( i = p_condvar->i_waiting_threads; i > 0; i-- ) - { - PulseEvent( p_condvar->event ); - } - i_result = 0; - -#elif defined( WIN32 ) - int i; - - /* Release all waiting threads. */ - if( !p_condvar->semaphore ) - { - for( i = p_condvar->i_waiting_threads; i > 0; i-- ) - { - PulseEvent( p_condvar->event ); - } - } - else if( p_condvar->i_win9x_cv == 1 ) - { - /* 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 ); - - /* 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 ); - } - } - else - { - if( p_condvar->i_waiting_threads ) - { - ReleaseSemaphore( p_condvar->semaphore, - p_condvar->i_waiting_threads, 0 ); - - /* Wait for the last thread to be awakened */ - WaitForSingleObject( p_condvar->event, INFINITE ); - } - } - i_result = 0; #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - i_result = pthread_cond_broadcast( &p_condvar->cond ); + i_result = pthread_cond_signal( &p_condvar->cond ); if ( i_result ) { i_thread = (int)pthread_self(); @@ -441,48 +334,12 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line, } i_result = 0; -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - if( p_condvar == NULL ) - { - i_result = B_BAD_VALUE; - } - else if( p_condvar->init < 2000 ) - { - i_result = B_NO_INIT; - } - else - { - while( p_condvar->thread != -1 ) - { - thread_info info; - if( get_thread_info(p_condvar->thread, &info) == B_BAD_VALUE ) - { - return 0; - } - - 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; - } #endif if( i_result ) { msg_Err( p_condvar->p_this, - "thread %d: cond_broadcast failed at %s:%d (%d:%s)", + "thread %u: cond_signal failed at %s:%d (%d:%s)", i_thread, psz_file, i_line, i_result, psz_error ); } @@ -495,7 +352,7 @@ static inline int __vlc_cond_broadcast( char * psz_file, int i_line, #define vlc_cond_wait( P_COND, P_MUTEX ) \ __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX ) -static inline int __vlc_cond_wait( char * psz_file, int i_line, +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; @@ -504,7 +361,8 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, const char * psz_error = ""; #if defined( PTH_INIT_IN_PTH_H ) - i_result = pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL ); + i_result = ( pth_cond_await( &p_condvar->cond, &p_mutex->mutex, NULL ) + == FALSE ); #elif defined( ST_INIT_IN_ST_H ) st_mutex_unlock( p_mutex->mutex ); @@ -598,45 +456,6 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, i_result = 0; -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - -# 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_thread = (int)pthread_self(); - psz_error = strerror(i_result); - } - -#elif defined( HAVE_CTHREADS_H ) - condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex ); - i_result = 0; - #elif defined( HAVE_KERNEL_SCHEDULER_H ) if( p_condvar == NULL ) { @@ -662,12 +481,51 @@ static inline int __vlc_cond_wait( char * psz_file, int i_line, vlc_mutex_lock( p_mutex ); i_result = 0; +#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) + +# ifdef DEBUG + /* In debug mode, timeout */ + struct timeval now; + struct timespec timeout; + + 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 ) + { + /* People keep pissing me off with this. --Meuuh */ + msg_Dbg( p_condvar->p_this, + "thread %u: secret message triggered " + "at %s:%d (%s)", (int)pthread_self(), + psz_file, i_line, strerror(i_result) ); + + 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 = (int)pthread_self(); + psz_error = strerror(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_wait failed at %s:%d (%d:%s)", + "thread %u: cond_wait failed at %s:%d (%d:%s)", i_thread, psz_file, i_line, i_result, psz_error ); }