From b41f74438672dd682bc01ae818cb3da654f22c1e Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 13 Feb 2013 10:41:10 +0100 Subject: Updated to latest CVS version of pthreads --- pthreads/pthread_mutex_consistent.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'pthreads/pthread_mutex_consistent.c') diff --git a/pthreads/pthread_mutex_consistent.c b/pthreads/pthread_mutex_consistent.c index b7805e7b1..053a5a6ce 100644 --- a/pthreads/pthread_mutex_consistent.c +++ b/pthreads/pthread_mutex_consistent.c @@ -8,10 +8,11 @@ * * Pthreads-win32 - POSIX Threads Library for Win32 * Copyright(C) 1998 John E. Bossom - * Copyright(C) 1999,2005 Pthreads-win32 contributors - * - * Contact Email: rpj@callisto.canberra.edu.au - * + * Copyright(C) 1999,2012 Pthreads-win32 contributors + * + * Homepage1: http://sourceware.org/pthreads-win32/ + * Homepage2: http://sourceforge.net/projects/pthreads4w/ + * * The current list of contributors is contained * in the file CONTRIBUTORS included with the source * code distribution. The list can also be seen at the @@ -34,6 +35,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include +#endif + /* * From the Sun Multi-threaded Programming Guide * @@ -41,29 +46,29 @@ * mutex, usually because its process terminated abnormally. The value of robustness that is * defined in pthread.h is PTHREAD_MUTEX_ROBUST or PTHREAD_MUTEX_STALLED. The * default value is PTHREAD_MUTEX_STALLED . - * ■ PTHREAD_MUTEX_STALLED + * [] PTHREAD_MUTEX_STALLED * When the owner of the mutex terminates without unlocking the mutex, all subsequent calls * to pthread_mutex_lock() are blocked from progress in an unspecified manner. - * ■ PTHREAD_MUTEX_ROBUST + * [] PTHREAD_MUTEX_ROBUST * When the owner of the mutex terminates without unlocking the mutex, the mutex is * unlocked. The next owner of this mutex acquires the mutex with an error return of * EOWNERDEAD. - * Note – Your application must always check the return code from pthread_mutex_lock() for + * Note - Your application must always check the return code from pthread_mutex_lock() for * a mutex initialized with the PTHREAD_MUTEX_ROBUST attribute. - * ■ The new owner of this mutex should make the state protected by the mutex consistent. + * [] The new owner of this mutex should make the state protected by the mutex consistent. * This state might have been left inconsistent when the previous owner terminated. - * ■ If the new owner is able to make the state consistent, call + * [] If the new owner is able to make the state consistent, call * pthread_mutex_consistent() for the mutex before unlocking the mutex. This * marks the mutex as consistent and subsequent calls to pthread_mutex_lock() and * pthread_mutex_unlock() will behave in the normal manner. - * ■ If the new owner is not able to make the state consistent, do not call + * [] If the new owner is not able to make the state consistent, do not call * pthread_mutex_consistent() for the mutex, but unlock the mutex. * All waiters are woken up and all subsequent calls to pthread_mutex_lock() fail to * acquire the mutex. The return code is ENOTRECOVERABLE. The mutex can be made * consistent by calling pthread_mutex_destroy() to uninitialize the mutex, and calling * pthread_mutex_int() to reinitialize the mutex.However, the state that was protected * by the mutex remains inconsistent and some form of application recovery is required. - * ■ If the thread that acquires the lock with EOWNERDEAD terminates without unlocking the + * [] If the thread that acquires the lock with EOWNERDEAD terminates without unlocking the * mutex, the next owner acquires the lock with an EOWNERDEAD return code. */ #if !defined(_UWIN) @@ -100,9 +105,9 @@ ptw32_robust_mutex_inherit(pthread_mutex_t * mutex) } /* - * The next two internal support functions depend on only being - * called by the thread that owns the robust mutex. This enables - * us to avoid additional locks. + * The next two internal support functions depend on being + * called only by the thread that owns the robust mutex. This + * enables us to avoid additional locks. * Any mutex currently in the thread's robust mutex list is held * by the thread, again eliminating the need for locks. * The forward/backward links allow the thread to unlock mutexes -- cgit v1.2.3