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

diff --git a/src/thread.h b/src/thread.h
index dea9d797..a88bb6d3 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -22,7 +22,6 @@
 
 #include <set>
 
-#include "lock.h"
 #include "material.h"
 #include "movepick.h"
 #include "pawns.h"
@@ -30,13 +29,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 +44,8 @@ struct SplitPoint {
 
   // Const pointers to shared data
   MovePicker* mp;
-  Search::Stack* ss;
+  SplitPoint* parent;
+
 
   // Shared data
   Lock lock;
@@ -53,6 +53,7 @@ struct SplitPoint {
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
+  volatile Move bestMove;
   volatile int moveCount;
   volatile bool cutoff;
 };
@@ -65,6 +66,9 @@ struct SplitPoint {
 
 struct Thread {
 
+  Thread(int id);
+  ~Thread();
+
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
@@ -73,7 +77,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 +85,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;
@@ -99,7 +103,7 @@ class ThreadsManager {
      static storage duration are automatically set to zero before enter main()
   */
 public:
-  Thread& operator[](int threadID) { return threads[threadID]; }
+  Thread& operator[](int threadID) { return *threads[threadID]; }
   void init();
   void exit();
 
@@ -107,7 +111,8 @@ public:
   int min_split_depth() const { return minimumSplitDepth; }
   int size() const { return activeThreads; }
 
-  void set_size(int cnt);
+  void wake_up();
+  void sleep();
   void read_uci_options();
   bool available_slave_exists(int master) const;
   void set_timer(int msec);
@@ -116,12 +121,13 @@ 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;
 
-  Thread threads[MAX_THREADS + 1]; // Last one is used as a timer
+  Thread* timer;
+  Thread* threads[MAX_THREADS];
   Lock splitLock;
   WaitCondition sleepCond;
   Depth minimumSplitDepth;