X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=11c8778d8e21e4ce8a5c603fecb0e74981509a5e;hp=beb09e4d5df5700a212bb08db0b84e5a7c161a9a;hb=258da28e79d99f75e0b626697bda2d459a37c0e6;hpb=7fb6fd2f558c9e2967fb393238d1dbe063f2d277

diff --git a/src/thread.h b/src/thread.h
index beb09e4d..11c8778d 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -30,23 +30,23 @@
 #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;
-  int ply;
   int master;
   Move threatMove;
 
   // Const pointers to shared data
   MovePicker* mp;
-  Search::Stack* ss;
+  SplitPoint* parent;
+
 
   // Shared data
   Lock lock;
@@ -54,8 +54,9 @@ struct SplitPoint {
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
+  volatile Move bestMove;
   volatile int moveCount;
-  volatile bool is_betaCutoff;
+  volatile bool cutoff;
 };
 
 
@@ -72,8 +73,9 @@ struct Thread {
   void idle_loop(SplitPoint* sp_master);
   void main_loop();
   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;
@@ -111,24 +113,23 @@ public:
   void read_uci_options();
   bool available_slave_exists(int master) const;
   void set_timer(int msec);
-  void wait_for_stop_or_ponderhit();
   void stop_thinking();
   void start_thinking(const Position& pos, const Search::LimitsType& limits,
                       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;
 
   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;