lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Properly handle forced elision in pthread_mutex_trylock (bug 16657)

Browse Source
This commit is contained in:
Andreas Schwab
2014-03-04 13:00:26 +01:00
parent da5bcaa499
commit b0a3c1640a
5 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nptl/pthread_mutex_trylock.c
View File

@ -26,8 +26,8 @@
#define lll_trylock_elision(a,t) lll_trylock(a)
#endif
#ifndef DO_ELISION
#define DO_ELISION(m) 0
#ifndef FORCE_ELISION
#define FORCE_ELISION(m, s)
#endif
/* We don't force elision in trylock, because this can lead to inconsistent
@ -69,7 +69,7 @@ __pthread_mutex_trylock (mutex)
break;
case PTHREAD_MUTEX_TIMED_ELISION_NP:
elision:
elision: __attribute__((unused))
if (lll_trylock_elision (mutex->__data.__lock,
mutex->__data.__elision) != 0)
break;
@ -77,8 +77,7 @@ __pthread_mutex_trylock (mutex)
return 0;
case PTHREAD_MUTEX_TIMED_NP:
if (DO_ELISION (mutex))
goto elision;
FORCE_ELISION (mutex, goto elision);
/*FALL THROUGH*/
case PTHREAD_MUTEX_ADAPTIVE_NP:
case PTHREAD_MUTEX_ERRORCHECK_NP: