Reduce lock contention in idle_loop

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 80363fa7f187aac9c65cec13314a879b2c4807a9..c93bcb4d9f8074d0c0c76b5d8afc4d6ef1c00704 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -40,7 +40,6 @@ struct SplitPoint {
   Depth depth;
   Value beta;
   int nodeType;
-  int ply;
   int master;
   Move threatMove;
 
@@ -50,12 +49,12 @@ struct SplitPoint {
 
   // Shared data
   Lock lock;
+  volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
   volatile bool is_betaCutoff;
-  volatile bool is_slave[MAX_THREADS];
 };
 
 
@@ -69,7 +68,7 @@ struct Thread {
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp);
+  void idle_loop(SplitPoint* sp_master);
   void main_loop();
   void timer_loop();
 
@@ -85,7 +84,7 @@ struct Thread {
   volatile int activeSplitPoints;
   volatile bool is_searching;
   volatile bool do_sleep;
-  volatile bool do_terminate;
+  volatile bool do_exit;
 };
 
 
@@ -110,7 +109,6 @@ public:
   void set_size(int cnt);
   void read_uci_options();
   bool available_slave_exists(int master) const;
-  bool split_point_finished(SplitPoint* sp) const;
   void set_timer(int msec);
   void wait_for_stop_or_ponderhit();
   void stop_thinking();
@@ -124,12 +122,12 @@ private:
   friend struct Thread;
 
   Thread threads[MAX_THREADS + 1]; // Last one is used as a timer
-  Lock threadsLock;
+  Lock splitLock;
+  WaitCondition sleepCond;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
   int activeThreads;
   bool useSleepingThreads;
-  WaitCondition sleepCond;
 };
 
 extern ThreadsManager Threads;