X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_threads.h;h=3770e2fa0f401e7b6f0760e52fa1451c98028f9a;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=bf017f4720a9f95c82d383c2f27433c8bef1eb2f;hpb=dd4f2531ca3729b49ef5f9e992dbd3bd8a7328e6;p=vlc diff --git a/include/vlc_threads.h b/include/vlc_threads.h index bf017f4720..3770e2fa0f 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -1,19 +1,20 @@ /***************************************************************************** - * threads.h : threads implementation for the VideoLAN client - * This header provides a portable threads implementation. + * vlc_threads.h : threads implementation for the VideoLAN client + * This header provides portable declarations for mutexes & conditions ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: vlc_threads.h,v 1.4 2002/07/05 11:18:56 sam Exp $ + * Copyright (C) 1999, 2002 the VideoLAN team + * Copyright © 2007-2008 Rémi Denis-Courmont * * Authors: Jean-Marc Dressler * Samuel Hocevar * 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 * (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 @@ -21,666 +22,436 @@ * * 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. *****************************************************************************/ -#include - -#if defined(GPROF) || defined(DEBUG) -# include -#endif +#ifndef VLC_THREADS_H_ +#define VLC_THREADS_H_ -#if defined( PTH_INIT_IN_PTH_H ) /* GNU Pth */ -# include +/** + * \file + * This file defines structures and functions for handling threads in vlc + * + */ -#elif defined( ST_INIT_IN_ST_H ) /* State threads */ -# include +#if defined( UNDER_CE ) +#elif defined( WIN32 ) +# include /* Win32 API */ -#elif defined( WIN32 ) /* Win32 API */ -# include +#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 */ -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */ +# include /* _POSIX_SPIN_LOCKS */ # include -# ifdef DEBUG - /* Needed for pthread_cond_timedwait */ -# include -# endif - /* This is not prototyped under Linux, though it exists. */ - int pthread_mutexattr_setkind_np( pthread_mutexattr_t *attr, int kind ); -#elif defined( HAVE_CTHREADS_H ) /* GNUMach */ -# include - -#elif defined( HAVE_KERNEL_SCHEDULER_H ) /* BeOS */ -# include -# include -# include - -#else -# error no threads available on your system ! +/* Unnamed POSIX semaphores not supported on Mac OS X, use Mach semaphores instead */ +# if defined (__APPLE__) +# include +# include +# else +# include +# endif #endif /***************************************************************************** * Constants - ***************************************************************************** - * These constants are used by all threads in *_CreateThread() and - * *_DestroyThreads() functions. Since those calls are non-blocking, an integer - * value is used as a shared flag to represent the status of the thread. *****************************************************************************/ -/* Void status - this value can be used to make sure no operation is currently - * in progress on the concerned thread in an array of recorded threads */ -#define THREAD_NOP 0 /* nothing happened */ - -/* Creation status */ -#define THREAD_CREATE 10 /* thread is initializing */ -#define THREAD_START 11 /* thread has forked */ -#define THREAD_READY 19 /* thread is ready */ +/* Thread priorities */ +#ifdef __APPLE__ +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT 22 +# define VLC_THREAD_PRIORITY_AUDIO 22 +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT 22 +# define VLC_THREAD_PRIORITY_HIGHEST 22 + +#elif defined(LIBVLC_USE_PTHREAD) +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT 10 +# define VLC_THREAD_PRIORITY_AUDIO 5 +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT 15 +# define VLC_THREAD_PRIORITY_HIGHEST 20 + +#elif defined(WIN32) || defined(UNDER_CE) +/* Define different priorities for WinNT/2K/XP and Win9x/Me */ +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT \ + THREAD_PRIORITY_ABOVE_NORMAL +# define VLC_THREAD_PRIORITY_AUDIO \ + THREAD_PRIORITY_HIGHEST +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT \ + THREAD_PRIORITY_ABOVE_NORMAL +# define VLC_THREAD_PRIORITY_HIGHEST \ + THREAD_PRIORITY_TIME_CRITICAL -/* Destructions status */ -#define THREAD_DESTROY 20 /* destruction order has been sent */ -#define THREAD_END 21 /* destruction order has been received */ -#define THREAD_OVER 29 /* thread does not exist any more */ +#else +# define VLC_THREAD_PRIORITY_LOW 0 +# define VLC_THREAD_PRIORITY_INPUT 0 +# define VLC_THREAD_PRIORITY_AUDIO 0 +# define VLC_THREAD_PRIORITY_VIDEO 0 +# define VLC_THREAD_PRIORITY_OUTPUT 0 +# define VLC_THREAD_PRIORITY_HIGHEST 0 -/* Error status */ -#define THREAD_ERROR 30 /* an error occured */ -#define THREAD_FATAL 31 /* an fatal error occured - program must end */ +#endif /***************************************************************************** * Type definitions *****************************************************************************/ -#if defined( PTH_INIT_IN_PTH_H ) -typedef pth_t vlc_thread_t; -typedef pth_mutex_t vlc_mutex_t; -typedef pth_cond_t vlc_cond_t; - -#elif defined( ST_INIT_IN_ST_H ) -typedef st_thread_t * vlc_thread_t; -typedef st_mutex_t * vlc_mutex_t; -typedef st_cond_t * vlc_cond_t; +#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; +#define VLC_STATIC_COND PTHREAD_COND_INITIALIZER +typedef pthread_rwlock_t vlc_rwlock_t; +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 ) +#if !defined( UNDER_CE ) typedef HANDLE vlc_thread_t; -typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL ); -typedef unsigned (__stdcall *PTHREAD_START) (void *); - -typedef struct -{ - /* WinNT/2K/XP implementation */ - HANDLE mutex; - /* Win95/98/ME implementation */ - CRITICAL_SECTION csection; -} vlc_mutex_t; - +#else typedef struct { - int i_waiting_threads; - /* WinNT/2K/XP implementation */ - HANDLE semaphore; - HANDLE signal; - vlc_bool_t b_broadcast; - SIGNALOBJECTANDWAIT SignalObjectAndWait; - /* Win95/98/ME implementation */ - HANDLE p_events[2]; -} vlc_cond_t; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) -typedef pthread_t vlc_thread_t; -typedef pthread_mutex_t vlc_mutex_t; -typedef pthread_cond_t vlc_cond_t; - -#elif defined( HAVE_CTHREADS_H ) -typedef cthread_t vlc_thread_t; + HANDLE handle; + HANDLE cancel_event; +} *vlc_thread_t; +#endif -/* Those structs are the ones defined in /include/cthreads.h but we need - * to handle (&foo) where foo is a (mutex_t) while they handle (foo) where - * foo is a (mutex_t*) */ typedef struct { - spin_lock_t held; - spin_lock_t lock; - char *name; - struct cthread_queue queue; + bool dynamic; + union + { + struct + { + bool locked; + unsigned long contention; + }; + CRITICAL_SECTION mutex; + }; } vlc_mutex_t; +#define VLC_STATIC_MUTEX { false, { { false, 0 } } } typedef struct { - spin_lock_t lock; - struct cthread_queue queue; - char *name; - struct cond_imp *implications; + HANDLE handle; + unsigned clock; } vlc_cond_t; -#elif defined( HAVE_KERNEL_SCHEDULER_H ) -/* This is the BeOS implementation of the vlc threads, note that the mutex is - * not a real mutex and the cond_var is not like a pthread cond_var but it is - * enough for what wee need */ - -typedef thread_id vlc_thread_t; - -typedef struct -{ - int32 init; - sem_id lock; -} vlc_mutex_t; +typedef HANDLE vlc_sem_t; typedef struct { - int32 init; - thread_id thread; -} vlc_cond_t; + vlc_mutex_t mutex; + vlc_cond_t read_wait; + vlc_cond_t write_wait; + unsigned long readers; + unsigned long writers; + DWORD writer; +} vlc_rwlock_t; + +typedef DWORD vlc_threadvar_t; +typedef struct vlc_timer *vlc_timer_t; +#endif +#if defined( WIN32 ) && !defined ETIMEDOUT +# define ETIMEDOUT 10060 /* This is the value in winsock.h. */ #endif /***************************************************************************** * Function definitions *****************************************************************************/ -VLC_EXPORT( int, __vlc_threads_init, ( vlc_object_t * ) ); -VLC_EXPORT( int, vlc_threads_end, ( void ) ); -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_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 * ), vlc_bool_t ) ); -VLC_EXPORT( void, __vlc_thread_ready, ( vlc_object_t * ) ); -VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, char *, int ) ); +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 ); + +#ifndef LIBVLC_USE_PTHREAD_CANCEL +enum { + VLC_CLEANUP_PUSH, + VLC_CLEANUP_POP, +}; +#endif -/***************************************************************************** - * vlc_threads_init: initialize threads system - *****************************************************************************/ -#define vlc_threads_init( P_THIS ) \ - __vlc_threads_init( CAST_TO_VLC_OBJECT(P_THIS) ) +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) +/** + * Registers a new procedure to run if the thread is cancelled (or otherwise + * exits prematurely). Any call to vlc_cleanup_push() must paired with a + * call to either vlc_cleanup_pop() or vlc_cleanup_run(). Branching into or out + * of the block between these two function calls is not allowed (read: it will + * likely crash the whole process). If multiple procedures are registered, + * they are handled in last-in first-out order. + * + * @param routine procedure to call if the thread ends + * @param arg argument for the procedure + */ +# define vlc_cleanup_push( routine, arg ) pthread_cleanup_push (routine, arg) -/***************************************************************************** - * vlc_mutex_init: initialize a mutex - *****************************************************************************/ -#define vlc_mutex_init( P_THIS, P_MUTEX ) \ - __vlc_mutex_init( CAST_TO_VLC_OBJECT(P_THIS), P_MUTEX ) +/** + * Removes a cleanup procedure that was previously registered with + * vlc_cleanup_push(). + */ +# define vlc_cleanup_pop( ) pthread_cleanup_pop (0) -/***************************************************************************** - * vlc_mutex_lock: lock a mutex - *****************************************************************************/ -#ifdef DEBUG -# define vlc_mutex_lock( P_MUTEX ) \ - __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX ) +/** + * Removes a cleanup procedure that was previously registered with + * vlc_cleanup_push(), and executes it. + */ +# define vlc_cleanup_run( ) pthread_cleanup_pop (1) #else -# define vlc_mutex_lock( P_MUTEX ) \ - __vlc_mutex_lock( "(unknown)", 0, P_MUTEX ) -#endif +typedef struct vlc_cleanup_t vlc_cleanup_t; -static inline int __vlc_mutex_lock( char * psz_file, int i_line, - vlc_mutex_t *p_mutex ) +struct vlc_cleanup_t { -#if defined( PTH_INIT_IN_PTH_H ) - return pth_mutex_acquire( p_mutex, TRUE, NULL ); - -#elif defined( ST_INIT_IN_ST_H ) - return st_mutex_lock( *p_mutex ); + vlc_cleanup_t *next; + void (*proc) (void *); + void *data; +}; + +/* This macros opens a code block on purpose. This is needed for multiple + * 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 { \ + vlc_cleanup_t vlc_cleanup_data = { NULL, routine, arg, }; \ + vlc_control_cancel (VLC_CLEANUP_PUSH, &vlc_cleanup_data) + +# define vlc_cleanup_pop( ) \ + vlc_control_cancel (VLC_CLEANUP_POP); \ + } while (0) + +# define vlc_cleanup_run( ) \ + vlc_control_cancel (VLC_CLEANUP_POP); \ + vlc_cleanup_data.proc (vlc_cleanup_data.data); \ + } while (0) + +#endif /* LIBVLC_USE_PTHREAD_CANCEL */ + +static inline void vlc_cleanup_lock (void *lock) +{ + vlc_mutex_unlock ((vlc_mutex_t *)lock); +} +#define mutex_cleanup_push( lock ) vlc_cleanup_push (vlc_cleanup_lock, lock) -#elif defined( WIN32 ) - if( p_mutex->mutex ) - { - WaitForSingleObject( p_mutex->mutex, INFINITE ); - } - else - { - EnterCriticalSection( &p_mutex->csection ); - } - return 0; +# if defined (_POSIX_SPIN_LOCKS) && ((_POSIX_SPIN_LOCKS - 0) > 0) +typedef pthread_spinlock_t vlc_spinlock_t; -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - int i_return = pthread_mutex_lock( p_mutex ); - if( i_return ) - { -// msg_Err( "thread %d: mutex_lock failed at %s:%d (%s)", -// pthread_self(), psz_file, i_line, strerror(i_return) ); - } - return i_return; +/** + * Initializes a spinlock. + */ +static inline void vlc_spin_init (vlc_spinlock_t *spin) +{ + if (pthread_spin_init (spin, PTHREAD_PROCESS_PRIVATE)) + abort (); +} -#elif defined( HAVE_CTHREADS_H ) - mutex_lock( p_mutex ); - return 0; +/** + * Acquires a spinlock. + */ +static inline void vlc_spin_lock (vlc_spinlock_t *spin) +{ + pthread_spin_lock (spin); +} -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - status_t err; +/** + * Releases a spinlock. + */ +static inline void vlc_spin_unlock (vlc_spinlock_t *spin) +{ + pthread_spin_unlock (spin); +} - if( !p_mutex ) - { - return B_BAD_VALUE; - } +/** + * Deinitializes a spinlock. + */ +static inline void vlc_spin_destroy (vlc_spinlock_t *spin) +{ + pthread_spin_destroy (spin); +} - if( p_mutex->init < 2000 ) - { - return B_NO_INIT; - } +#elif defined (WIN32) && !defined (UNDER_CE) - err = acquire_sem( p_mutex->lock ); - return err; +typedef CRITICAL_SECTION vlc_spinlock_t; -#endif +/** + * Initializes a spinlock. + */ +static inline void vlc_spin_init (vlc_spinlock_t *spin) +{ + if (!InitializeCriticalSectionAndSpinCount(spin, 4000)) + abort (); } -/***************************************************************************** - * vlc_mutex_unlock: unlock a mutex - *****************************************************************************/ -#ifdef DEBUG -# define vlc_mutex_unlock( P_MUTEX ) \ - __vlc_mutex_unlock( __FILE__, __LINE__, P_MUTEX ) -#else -# define vlc_mutex_unlock( P_MUTEX ) \ - __vlc_mutex_unlock( "(unknown)", 0, P_MUTEX ) -#endif - -static inline int __vlc_mutex_unlock( char * psz_file, int i_line, - vlc_mutex_t *p_mutex ) +/** + * Acquires a spinlock. + */ +static inline void vlc_spin_lock (vlc_spinlock_t *spin) { -#if defined( PTH_INIT_IN_PTH_H ) - return pth_mutex_release( p_mutex ); - -#elif defined( ST_INIT_IN_ST_H ) - return st_mutex_unlock( *p_mutex ); - -#elif defined( WIN32 ) - if( p_mutex->mutex ) - { - ReleaseMutex( p_mutex->mutex ); - } - else - { - LeaveCriticalSection( &p_mutex->csection ); - } - return 0; + EnterCriticalSection(spin); +} -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - int i_return = pthread_mutex_unlock( p_mutex ); - if( i_return ) - { -// msg_Err( "thread %d: mutex_unlock failed at %s:%d (%s)", -// pthread_self(), psz_file, i_line, strerror(i_return) ); - } - return i_return; +/** + * Releases a spinlock. + */ +static inline void vlc_spin_unlock (vlc_spinlock_t *spin) +{ + LeaveCriticalSection(spin); +} -#elif defined( HAVE_CTHREADS_H ) - mutex_unlock( p_mutex ); - return 0; +/** + * Deinitializes a spinlock. + */ +static inline void vlc_spin_destroy (vlc_spinlock_t *spin) +{ + DeleteCriticalSection(spin); +} -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - if( !p_mutex) - { - return B_BAD_VALUE; - } +#else - if( p_mutex->init < 2000 ) - { - return B_NO_INIT; - } +/* Fallback to plain mutexes if spinlocks are not available */ +typedef vlc_mutex_t vlc_spinlock_t; - release_sem( p_mutex->lock ); - return B_OK; +static inline void vlc_spin_init (vlc_spinlock_t *spin) +{ + vlc_mutex_init (spin); +} +# define vlc_spin_lock vlc_mutex_lock +# define vlc_spin_unlock vlc_mutex_unlock +# define vlc_spin_destroy vlc_mutex_destroy #endif -} -/***************************************************************************** - * vlc_mutex_destroy: destroy a mutex - *****************************************************************************/ -#ifdef DEBUG -# define vlc_mutex_destroy( P_MUTEX ) \ - __vlc_mutex_destroy( __FILE__, __LINE__, P_MUTEX ) +/** + * Issues a full memory barrier. + */ +#if defined (__APPLE__) +# include /* OSMemoryBarrier() */ +#endif +static inline void barrier (void) +{ +#if defined (__GNUC__) && !defined (__APPLE__) && \ + ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) + __sync_synchronize (); +#elif defined(__APPLE__) + OSMemoryBarrier (); +#elif defined(__powerpc__) + asm volatile ("sync":::"memory"); +#elif 0 // defined(__i386__) /* Requires SSE2 support */ + asm volatile ("mfence":::"memory"); #else -# define vlc_mutex_destroy( P_MUTEX ) \ - __vlc_mutex_destroy( "(unknown)", 0, P_MUTEX ) + vlc_spinlock_t spin; + vlc_spin_init (&spin); + vlc_spin_lock (&spin); + vlc_spin_unlock (&spin); + vlc_spin_destroy (&spin); #endif +} /***************************************************************************** - * vlc_cond_init: initialize a condition + * vlc_thread_create: create a thread *****************************************************************************/ -#define vlc_cond_init( P_THIS, P_COND ) \ - __vlc_cond_init( CAST_TO_VLC_OBJECT(P_THIS), P_COND ) +#define vlc_thread_create( P_THIS, PSZ_NAME, FUNC, PRIORITY ) \ + vlc_thread_create( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PSZ_NAME, FUNC, PRIORITY ) /***************************************************************************** - * vlc_cond_signal: start a thread on condition completion + * vlc_thread_set_priority: set the priority of the calling thread *****************************************************************************/ -static inline int vlc_cond_signal( vlc_cond_t *p_condvar ) -{ -#if defined( PTH_INIT_IN_PTH_H ) - return pth_cond_notify( p_condvar, FALSE ); - -#elif defined( ST_INIT_IN_ST_H ) - return st_cond_signal( *p_condvar ); - -#elif defined( WIN32 ) - /* 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 */ - if( p_condvar->i_waiting_threads ) - { - if( p_condvar->signal ) - { - ReleaseSemaphore( p_condvar->semaphore, 1, 0 ); - } - else - { - SetEvent( p_condvar->p_events[0/*signal*/] ); - } - } - return 0; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - return pthread_cond_signal( p_condvar ); - -#elif defined( HAVE_CTHREADS_H ) - /* condition_signal() */ - if ( p_condvar->queue.head || p_condvar->implications ) - { - cond_signal( (condition_t)p_condvar ); - } - return 0; - -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - if( !p_condvar ) - { - return B_BAD_VALUE; - } - - if( p_condvar->init < 2000 ) - { - return B_NO_INIT; - } - - 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; - } - } - return 0; - -#endif -} +#define vlc_thread_set_priority( P_THIS, PRIORITY ) \ + vlc_thread_set_priority( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PRIORITY ) /***************************************************************************** - * vlc_cond_broadcast: start all threads waiting on condition completion + * vlc_thread_join: wait until a thread exits *****************************************************************************/ -/* - * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME - * Only works with pthreads, you need to adapt it for others - * FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME +#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. */ -static inline int vlc_cond_broadcast( vlc_cond_t *p_condvar ) -{ -#if defined( PTH_INIT_IN_PTH_H ) - return pth_cond_notify( p_condvar, FALSE ); - -#elif defined( ST_INIT_IN_ST_H ) - return st_cond_broadcast( p_condvar ); - -#elif defined( WIN32 ) - /* Release all waiting threads. */ - if( p_condvar->i_waiting_threads ) - { - if( p_condvar->signal ) - { - p_condvar->b_broadcast = 1; - /* This call is atomic */ - ReleaseSemaphore( p_condvar->semaphore, - p_condvar->i_waiting_threads, 0 ); - /* Wait for all threads to get the semaphore */ - WaitForSingleObject( p_condvar->signal, INFINITE ); - p_condvar->b_broadcast = 0; - } - else - { - SetEvent( p_condvar->p_events[1/*broadcast*/] ); - } - } - return 0; - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - return pthread_cond_broadcast( p_condvar ); - -#elif defined( HAVE_CTHREADS_H ) - /* condition_signal() */ - if ( p_condvar->queue.head || p_condvar->implications ) - { - cond_signal( (condition_t)p_condvar ); - } - return 0; - -#elif defined( HAVE_KERNEL_SCHEDULER_H ) - if( !p_condvar ) - { - return B_BAD_VALUE; - } - - if( p_condvar->init < 2000 ) - { - return B_NO_INIT; - } - - 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; - } - } - return 0; - -#endif -} - -/***************************************************************************** - * vlc_cond_wait: wait until condition completion - *****************************************************************************/ -#ifdef DEBUG -# define vlc_cond_wait( P_COND, P_MUTEX ) \ - __vlc_cond_wait( __FILE__, __LINE__, P_COND, P_MUTEX ) -#else -# define vlc_cond_wait( P_COND, P_MUTEX ) \ - __vlc_cond_wait( "(unknown)", 0, P_COND, P_MUTEX ) -#endif - -static inline int __vlc_cond_wait( char * psz_file, int i_line, - vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex ) +class vlc_mutex_locker { -#if defined( PTH_INIT_IN_PTH_H ) - return pth_cond_await( p_condvar, p_mutex, NULL ); - -#elif defined( ST_INIT_IN_ST_H ) - int i_ret; - - st_mutex_unlock( *p_mutex ); - i_ret = st_cond_wait( *p_condvar ); - st_mutex_lock( *p_mutex ); - - return i_ret; - -#elif defined( WIN32 ) - /* Increase our wait count */ - p_condvar->i_waiting_threads++; - - if( p_condvar->signal ) - { - /* 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->semaphore, - INFINITE, FALSE ); - /* XXX: we should protect i_waiting_threads with a mutex, but - * is it really worth it ? */ - p_condvar->i_waiting_threads--; - - if( p_condvar->b_broadcast - && p_condvar->i_waiting_threads == 0 ) - { - p_condvar->SignalObjectAndWait( p_condvar->signal, p_mutex->mutex, - INFINITE, FALSE ); - } - else - { - /* Just take back the lock */ - WaitForSingleObject( p_mutex->mutex, INFINITE ); - } - return 0; - } - else - { - int i_ret; - - /* Release the mutex, wait, and reacquire. */ - LeaveCriticalSection( &p_mutex->csection ); - i_ret = WaitForMultipleObjects( 2, p_condvar->p_events, - FALSE, INFINITE ); - EnterCriticalSection( &p_mutex->csection ); - - /* Decrease our wait count */ - p_condvar->i_waiting_threads--; - - /* If we are the last waiter and it was a broadcast signal, reset - * the broadcast event. */ - if( i_ret == WAIT_OBJECT_0 + 1/*broadcast*/ - && p_condvar->i_waiting_threads == 0 ) - { - ResetEvent( p_condvar->p_events[1/*broadcast*/] ); - } - - return( i_ret == WAIT_FAILED ); - } - -#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) - -# ifdef DEBUG - /* In debug mode, timeout */ - struct timeval now; - struct timespec timeout; - int i_result; - - 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, p_mutex, &timeout ); - - if( i_result == ETIMEDOUT ) + private: + vlc_mutex_t *lock; + public: + vlc_mutex_locker (vlc_mutex_t *m) : lock (m) { -//X msg_Warn( "thread %d: possible deadlock detected " -//X "in cond_wait at %s:%d (%s)", pthread_self(), -//X psz_file, i_line, strerror(i_result) ); - continue; + vlc_mutex_lock (lock); } - if( i_result ) + ~vlc_mutex_locker (void) { -//X msg_Err( "thread %d: cond_wait failed at %s:%d (%s)", -//X pthread_self(), psz_file, i_line, strerror(i_result) ); + vlc_mutex_unlock (lock); } - return( i_result ); - } -# else - return pthread_cond_wait( p_condvar, p_mutex ); -# endif - -#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 ) - { - return B_BAD_VALUE; - } - - if( !p_mutex ) - { - return B_BAD_VALUE; - } - - if( p_condvar->init < 2000 ) - { - return 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; - +}; #endif -} -/***************************************************************************** - * vlc_cond_destroy: destroy a condition - *****************************************************************************/ -#ifdef DEBUG -# define vlc_cond_destroy( P_COND ) \ - __vlc_cond_destroy( __FILE__, __LINE__, P_COND ) -#else -# define vlc_cond_destroy( P_COND ) \ - __vlc_cond_destroy( "(unknown)", 0, P_COND ) -#endif +enum { + VLC_AVCODEC_MUTEX = 0, + VLC_GCRYPT_MUTEX, + VLC_XLIB_MUTEX, + /* Insert new entry HERE */ + VLC_MAX_MUTEX +}; -/***************************************************************************** - * vlc_thread_create: create a thread - *****************************************************************************/ -# define vlc_thread_create( P_THIS, PSZ_NAME, FUNC, WAIT ) \ - __vlc_thread_create( CAST_TO_VLC_OBJECT(P_THIS), __FILE__, __LINE__, PSZ_NAME, (void * ( * ) ( void * ))FUNC, WAIT ) +VLC_EXPORT( 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 ) -/***************************************************************************** - * vlc_thread_ready: tell the parent thread we were successfully spawned - *****************************************************************************/ -# define vlc_thread_ready( P_THIS ) \ - __vlc_thread_ready( CAST_TO_VLC_OBJECT(P_THIS) ) - -/***************************************************************************** - * vlc_thread_join: wait until a thread exits - *****************************************************************************/ -#ifdef DEBUG -# define vlc_thread_join( P_THIS ) \ - __vlc_thread_join( CAST_TO_VLC_OBJECT(P_THIS), __FILE__, __LINE__ ) -#else -# define vlc_thread_join( P_THIS ) \ - __vlc_thread_join( CAST_TO_VLC_OBJECT(P_THIS), "(unknown)", 0 ) -#endif +#endif /* !_VLC_THREADS_H */