AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11599 Adjust atomic ops code to be more compatible with thread sanitizer tools.

Browse Source 
X-SVN-Rev: 37326
This commit is contained in:
Andy Heninger 2015-04-09 23:16:55 +00:00
parent 2efcd46ee3
commit d3301f2a4e
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icu4c/source/common/putilimp.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1997-2014, International Business Machines
* Copyright (C) 1997-2015, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -229,6 +229,26 @@ typedef size_t uintptr_t;
#endif
/**
* \def U_HAVE_CLANG_ATOMICS
* Defines whether Clang c11 style built-in atomics are avaialable.
* These are used in preference to gcc atomics when both are available.
*/
#ifdef U_HAVE_CLANG_ATOMICS
/* Use the predefined value. */
#elif !defined(__clang__)
# define U_HAVE_CLANG_ATOMICS 0
#else
#if __has_builtin(__c11_atomic_load) && \
__has_builtin(__c11_atomic_store) && \
__has_builtin(__c11_atomic_fetch_add) && \
__has_builtin(__c11_atomic_fetch_sub)
# define U_HAVE_CLANG_ATOMICS 1
#else
# define U_HAVE_CLANG_ATOMICS 0
#endif
#endif
/*===========================================================================*/
/** @{ Code alignment */
/*===========================================================================*/

4
icu4c/source/common/umutex.cpp
View File

@ -344,8 +344,8 @@ umtx_atomic_dec(u_atomic_int32_t *p) {
U_COMMON_API int32_t U_EXPORT2
umtx_loadAcquire(u_atomic_int32_t &var) {
int32_t val = var;
umtx_lock(&gIncDecMutex);
int32_t val = var;
umtx_unlock(&gIncDecMutex);
return val;
}
@ -353,8 +353,8 @@ umtx_loadAcquire(u_atomic_int32_t &var) {
U_COMMON_API void U_EXPORT2
umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
umtx_lock(&gIncDecMutex);
umtx_unlock(&gIncDecMutex);
var = val;
umtx_unlock(&gIncDecMutex);
}
U_NAMESPACE_END

29
icu4c/source/common/umutex.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2014, International Business Machines
* Copyright (C) 1997-2015, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -118,6 +118,33 @@ inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
U_NAMESPACE_END
#elif U_HAVE_CLANG_ATOMICS
/*
* Clang __c11 atomic built-ins
*/
U_NAMESPACE_BEGIN
typedef _Atomic(int32_t) u_atomic_int32_t;
#define ATOMIC_INT32_T_INITIALIZER(val) val
inline int32_t umtx_loadAcquire(u_atomic_int32_t &var) {
return __c11_atomic_load(&var, __ATOMIC_ACQUIRE);
}
inline void umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
return __c11_atomic_store(&var, val, __ATOMIC_RELEASE);
}
inline int32_t umtx_atomic_inc(u_atomic_int32_t *var) {
return __c11_atomic_fetch_add(var, 1, __ATOMIC_SEQ_CST) + 1;
}
inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
return __c11_atomic_fetch_sub(var, 1, __ATOMIC_SEQ_CST) - 1;
}
U_NAMESPACE_END
#elif U_HAVE_GCC_ATOMICS
/*
* gcc atomic ops. These are available on several other compilers as well.