Use templetized operations for Square

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 87b78136f5c7851b992327cdc03d65205c7becc2..c209e125d1de0e62ec313307bdcd7d22c6b3f6ff 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -39,7 +39,7 @@
 ////
 
 const int MAX_THREADS = 8;
-const int ACTIVE_SPLIT_POINTS_MAX = 8;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
 
 
 ////
@@ -54,7 +54,8 @@ struct SplitPoint {
   Depth depth;
   bool pvNode, mateThreat;
   Value beta;
-  int ply, master, slaves[MAX_THREADS];
+  int ply;
+  Move threatMove;
   SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
 
   // Const pointers to shared data
@@ -65,9 +66,9 @@ struct SplitPoint {
   Lock lock;
   volatile Value alpha;
   volatile Value bestValue;
-  volatile int moves;
-  volatile int cpus;
+  volatile int moveCount;
   volatile bool stopRequest;
+  volatile int slaves[MAX_THREADS];
 };
 
 // ThreadState type is used to represent thread's current state
@@ -83,12 +84,12 @@ enum ThreadState
 };
 
 struct Thread {
-  SplitPoint* splitPoint;
-  volatile int activeSplitPoints;
   uint64_t nodes;
   uint64_t betaCutOffs[2];
   volatile ThreadState state;
-  unsigned char pad[64]; // set some distance among local data for each thread
+  SplitPoint* volatile splitPoint;
+  volatile int activeSplitPoints;
+  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
 };