From cb2111f0b62afec5fd977e1dd4ca5843bd006956 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 2 Mar 2015 08:11:39 +0100 Subject: [PATCH 1/1] Disable spinlocks Now that c++11 branch has been merged in master, disable unconditionally the spinlocks and use mutex instead. This will allow to run fishtest even on HT machines withouth changes. In the future we will reintorduce spinlocks, once we will have took care of fishtest. No functional change. --- src/thread.h | 2 +- src/types.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/thread.h b/src/thread.h index a639cf7e..34307297 100644 --- a/src/thread.h +++ b/src/thread.h @@ -39,7 +39,7 @@ const size_t MAX_THREADS = 128; const size_t MAX_SPLITPOINTS_PER_THREAD = 8; const size_t MAX_SLAVES_PER_SPLITPOINT = 4; -#if !defined(NO_SPINLOCK) +#if 0 /// Spinlock class wraps low level atomic operations to provide a spin lock class Spinlock { diff --git a/src/types.h b/src/types.h index c8078546..eebd69e5 100644 --- a/src/types.h +++ b/src/types.h @@ -31,9 +31,6 @@ /// -DNO_PREFETCH | Disable use of prefetch asm-instruction. You may need this to /// | run on some very old machines. /// -/// -DNO_SPINLOCK | Use mutex instead of spinlocks. This is much slower, so you -/// | really don't want to do this in general case. -/// /// -DUSE_POPCNT | Add runtime support for use of popcnt asm-instruction. Works /// | only in 64-bit mode and requires hardware with popcnt support. /// -- 2.39.2