Get rid of nativeThread

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 8f930149f333e764d3525fc9d93fd8f4dba3798b..ee7fb061229e0288ce163eda0ac944bda6118cb6 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -41,16 +41,17 @@ const size_t MAX_SPLITPOINTS_PER_THREAD = 8;
 const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
 
 class Spinlock {
-  std::atomic_int _lock;
+
+  std::atomic_int lock;
 
 public:
-  Spinlock() { _lock = 1; } // Init here to workaround a bug with MSVC 2013
-  void lock() {
-      while (_lock.fetch_sub(1, std::memory_order_acquire) != 1)
-          for (int cnt = 0; _lock.load(std::memory_order_relaxed) <= 0; ++cnt)
+  Spinlock() { lock = 1; } // Init here to workaround a bug with MSVC 2013
+  void acquire() {
+      while (lock.fetch_sub(1, std::memory_order_acquire) != 1)
+          for (int cnt = 0; lock.load(std::memory_order_relaxed) <= 0; ++cnt)
               if (cnt >= 10000) std::this_thread::yield(); // Be nice to hyperthreading
   }
-  void unlock() { _lock.store(1, std::memory_order_release); }
+  void release() { lock.store(1, std::memory_order_release); }
 };
 
 
@@ -73,7 +74,7 @@ struct SplitPoint {
   SplitPoint* parentSplitPoint;
 
   // Shared variable data
-  Spinlock mutex;
+  Spinlock spinlock;
   std::bitset<MAX_THREADS> slavesMask;
   volatile bool allSlavesSearching;
   volatile uint64_t nodes;
@@ -88,15 +89,15 @@ struct SplitPoint {
 /// ThreadBase struct is the base of the hierarchy from where we derive all the
 /// specialized thread classes.
 
-struct ThreadBase {
+struct ThreadBase : public std::thread {
 
   virtual ~ThreadBase() = default;
   virtual void idle_loop() = 0;
   void notify_one();
   void wait_for(volatile const bool& b);
 
-  std::thread nativeThread;
   Mutex mutex;
+  Spinlock spinlock;
   ConditionVariable sleepCondition;
   volatile bool exit = false;
 };
@@ -127,7 +128,6 @@ struct Thread : public ThreadBase {
   SplitPoint* volatile activeSplitPoint;
   volatile size_t splitPointsSize;
   volatile bool searching;
-  Spinlock allocMutex;
 };
 
 
@@ -136,6 +136,7 @@ struct Thread : public ThreadBase {
 
 struct MainThread : public Thread {
   virtual void idle_loop();
+  void join();
   volatile bool thinking = true; // Avoid a race with start_thinking()
 };
 
@@ -161,11 +162,9 @@ struct ThreadPool : public std::vector<Thread*> {
   MainThread* main() { return static_cast<MainThread*>(at(0)); }
   void read_uci_options();
   Thread* available_slave(const SplitPoint* sp) const;
-  void wait_for_think_finished();
   void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
 
   Depth minimumSplitDepth;
-  ConditionVariable sleepCondition;
   TimerThread* timer;
 };