zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drd: Avoid that the drd/tests/pth_mutex_reinit test fails with glibc >= 2.18

Browse Source 
Apparently with glibc >= 2.18 the value returned by pthread_mutexattr_gettype()
is not the same as the value passed to pthread_mutexattr_settype(). Add a
workaround for this glibc bug.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13792
This commit is contained in:
Bart Van Assche 2014-02-08 10:55:08 +00:00
parent 49987d5c4a
commit ea8a9313c2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drd/drd_pthread_intercepts.c
View File

@ -243,8 +243,14 @@ static void DRD_(sema_up)(DrdSema* sema)
* statement because some of the PTHREAD_MUTEX_ macro's may have the same
* value.
*/
static MutexT DRD_(pthread_to_drd_mutex_type)(const int kind)
static MutexT DRD_(pthread_to_drd_mutex_type)(int kind)
{
/*
* See also PTHREAD_MUTEX_KIND_MASK_NP in glibc source file
* <nptl/pthreadP.h>.
*/
kind &= 3;
if (kind == PTHREAD_MUTEX_RECURSIVE)
return mutex_type_recursive_mutex;
else if (kind == PTHREAD_MUTEX_ERRORCHECK)
@ -258,9 +264,7 @@ static MutexT DRD_(pthread_to_drd_mutex_type)(const int kind)
return mutex_type_default_mutex;
#endif
else
{
return mutex_type_invalid_mutex;
}
}
#define IS_ALIGNED(p) (((uintptr_t)(p) & (sizeof(*(p)) - 1)) == 0)