X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=11c8778d8e21e4ce8a5c603fecb0e74981509a5e;hb=2608b9249d9c25a699c8db8725e35bd4ec0b65ab;hp=dea9d79720112ed77902696b8b45877d77ffd5c0;hpb=b1cf1acb93532248fb10c2ca983d80389d5aeb84;p=stockfish

diff --git a/src/thread.h b/src/thread.h
index dea9d797..11c8778d 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -30,13 +30,13 @@
 #include "search.h"
 
 const int MAX_THREADS = 32;
-const int MAX_ACTIVE_SPLIT_POINTS = 8;
+const int MAX_SPLITPOINTS_PER_THREAD = 8;
 
 struct SplitPoint {
 
-  // Const data after splitPoint has been setup
-  SplitPoint* parent;
+  // Const data after split point has been setup
   const Position* pos;
+  const Search::Stack* ss;
   Depth depth;
   Value beta;
   int nodeType;
@@ -45,7 +45,8 @@ struct SplitPoint {
 
   // Const pointers to shared data
   MovePicker* mp;
-  Search::Stack* ss;
+  SplitPoint* parent;
+
 
   // Shared data
   Lock lock;
@@ -53,6 +54,7 @@ struct SplitPoint {
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
+  volatile Move bestMove;
   volatile int moveCount;
   volatile bool cutoff;
 };
@@ -73,7 +75,7 @@ struct Thread {
   void timer_loop();
   void wait_for_stop_or_ponderhit();
 
-  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
+  SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
   MaterialInfoTable materialTable;
   PawnInfoTable pawnTable;
   int threadID;
@@ -81,8 +83,8 @@ struct Thread {
   Lock sleepLock;
   WaitCondition sleepCond;
   ThreadHandle handle;
-  SplitPoint* volatile splitPoint;
-  volatile int activeSplitPoints;
+  SplitPoint* volatile curSplitPoint;
+  volatile int splitPointsCnt;
   volatile bool is_searching;
   volatile bool do_sleep;
   volatile bool do_exit;
@@ -116,7 +118,7 @@ public:
                       const std::set<Move>& = std::set<Move>(), bool async = false);
 
   template <bool Fake>
-  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue,
+  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
               Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
 private:
   friend struct Thread;