Save mateThreat flag in splitPoint and make use of it

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 3dc0f274ba7d21a853bcfc11ad2948b3dbb537c1..afbf226632cf78505729962609c01ae01cff5275 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -38,7 +38,7 @@
 //// Constants and variables
 ////
 
-const int THREAD_MAX = 8;
+const int MAX_THREADS = 8;
 const int ACTIVE_SPLIT_POINTS_MAX = 8;
 
 
@@ -47,35 +47,48 @@ const int ACTIVE_SPLIT_POINTS_MAX = 8;
 ////
 
 struct SplitPoint {
-  SplitPoint *parent;
+
+  // Const data after splitPoint has been setup
+  SplitPoint* parent;
   const Position* pos;
-  SearchStack sstack[THREAD_MAX][PLY_MAX_PLUS_2];
-  SearchStack *parentSstack;
-  int ply;
-  Depth depth;
-  volatile Value alpha, beta, bestValue;
-  Value futilityValue;
   bool pvNode;
-  int master, slaves[THREAD_MAX];
+  Depth depth;
+  bool mateThreat;
+  Value beta;
+  int ply, master, slaves[MAX_THREADS];
+  SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
+
+  // Const pointers to shared data
+  MovePicker* mp;
+  SearchStack* parentSstack;
+
+  // Shared data
   Lock lock;
-  MovePicker *mp;
+  volatile Value alpha;
+  volatile Value bestValue;
   volatile int moves;
   volatile int cpus;
-  bool finished;
+  volatile bool stopRequest;
 };
 
+// ThreadState type is used to represent thread's current state
+
+enum ThreadState
+{
+  THREAD_SEARCHING,     // thread is performing work
+  THREAD_AVAILABLE,     // thread is polling for work
+  THREAD_SLEEPING,      // we are not thinking, so thread is sleeping
+  THREAD_BOOKED,        // other thread (master) has booked us as a slave
+  THREAD_WORKISWAITING, // master has ordered us to start
+  THREAD_TERMINATED     // we are quitting and thread is terminated
+};
 
 struct Thread {
-  SplitPoint *splitPoint;
+  SplitPoint* splitPoint;
   volatile int activeSplitPoints;
   uint64_t nodes;
   uint64_t betaCutOffs[2];
-  volatile bool stop;
-  volatile bool running;
-  volatile bool idle;
-  volatile bool sleeping;
-  volatile bool workIsWaiting;
-  volatile bool printCurrentLineRequest;
+  volatile ThreadState state;
   unsigned char pad[64]; // set some distance among local data for each thread
 };