Rename THREAD_MAX in MAX_THREADS

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 558a6752da9c679cfa59f6c4b614356703df2680..e62857dd409b7df14ef90c59226f889b8413f570 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -26,7 +26,8 @@
 //// Includes
 ////
 
-#include "history.h"
+#include <cstring>
+
 #include "lock.h"
 #include "movepick.h"
 #include "position.h"
@@ -37,7 +38,8 @@
 //// Constants and variables
 ////
 
-const int THREAD_MAX = 8;
+const int MAX_THREADS = 8;
+const int ACTIVE_SPLIT_POINTS_MAX = 8;
 
 
 ////
@@ -46,15 +48,15 @@ const int THREAD_MAX = 8;
 
 struct SplitPoint {
   SplitPoint *parent;
-  Position pos;
-  SearchStack sstack[THREAD_MAX][PLY_MAX];
+  const Position* pos;
+  SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
   SearchStack *parentSstack;
   int ply;
   Depth depth;
   volatile Value alpha, beta, bestValue;
+  Value futilityValue;
   bool pvNode;
-  Bitboard dcCandidates;
-  int master, slaves[THREAD_MAX];
+  int master, slaves[MAX_THREADS];
   Lock lock;
   MovePicker *mp;
   volatile int moves;
@@ -65,16 +67,15 @@ struct SplitPoint {
 
 struct Thread {
   SplitPoint *splitPoint;
-  int activeSplitPoints;
+  volatile int activeSplitPoints;
   uint64_t nodes;
   uint64_t betaCutOffs[2];
-  bool failHighPly1;
-  volatile bool stop;
+  volatile bool stopRequest;
   volatile bool running;
   volatile bool idle;
+  volatile bool sleeping;
   volatile bool workIsWaiting;
-  volatile bool printCurrentLine;
-  History H;
+  volatile bool printCurrentLineRequest;
   unsigned char pad[64]; // set some distance among local data for each thread
 };