diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-18 19:15:57 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-18 19:15:57 +0100 |
| commit | 2c6b13d13ef25a7995d5efeeaf735942a2cc9d21 (patch) | |
| tree | cdc69e260bc058e581833881336d5fe329a27de7 /erts | |
| parent | 08549c6245f9ee31308618f9f3782a638af05a3e (diff) | |
| parent | e8de3281557ebb9c296a722735aa3ae9d256eb88 (diff) | |
| download | otp-2c6b13d13ef25a7995d5efeeaf735942a2cc9d21.tar.gz otp-2c6b13d13ef25a7995d5efeeaf735942a2cc9d21.tar.bz2 otp-2c6b13d13ef25a7995d5efeeaf735942a2cc9d21.zip | |
Merge branch 'sverk/valgrind-cuddling'
* sverk/valgrind-cuddling:
test_server: Increase timeout for VALGRIND
erts: Use native atomics and fallback spinlock to mutex for VALGRIND
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/include/internal/ethread.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index aef31e282a..6c006b3f07 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -59,10 +59,6 @@ # undef ETHR_TRY_INLINE_FUNCS #endif -#if !defined(ETHR_DISABLE_NATIVE_IMPLS) && (defined(PURIFY)||defined(VALGRIND)) -# define ETHR_DISABLE_NATIVE_IMPLS -#endif - /* Assume 64-byte cache line size */ #define ETHR_CACHE_LINE_SIZE 64 #define ETHR_CACHE_LINE_MASK (ETHR_CACHE_LINE_SIZE - 1) @@ -413,7 +409,11 @@ extern ethr_runtime_t ethr_runtime__; # endif #endif -#include "ethr_optimized_fallbacks.h" +#ifdef VALGRIND /* mutex as fallback for spinlock for VALGRIND */ +# undef ETHR_HAVE_NATIVE_SPINLOCKS +#else +# include "ethr_optimized_fallbacks.h" +#endif typedef struct { void *(*thread_create_prepare_func)(void); |