Re-enable spinlocks

For branch C++11, that doe snot run on fishtest,
there is no need of this kludge, let only master
have it.

No functional change.

diff --git a/src/thread.h b/src/thread.h
index a639cf7ea051e143782fc206212256aa8b2e248a..b6809f4e37221dcca2329b62980f07a7e42c5238 100644 (file)
--- 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)
+
 /// Spinlock class wraps low level atomic operations to provide a spin lock
 
 class Spinlock {
@@ -55,18 +55,6 @@ public:
   void release() { lock.store(1, std::memory_order_release); }
 };
 
-#else
-
-class Spinlock {
-
-  std::mutex mutex;
-
-public:
-  void acquire() { mutex.lock(); }
-  void release() { mutex.unlock(); }
-};
-
-#endif
 
 /// SplitPoint struct stores information shared by the threads searching in
 /// parallel below the same split point. It is populated at splitting time.

diff --git a/src/types.h b/src/types.h
index c8078546775d20ae49079317cc520b3e9545dc4f..eebd69e506c2cb19bd9f2390056dad41a2d383e1 100644 (file)
--- 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.
 ///