Revert "Fix a race on Limits::ponder"

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 0f117c2d2a7426040424abce254b5ee57ed67618..c1b635b7ea4db61dfca33ed0ee3423e3eeefb862 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -60,18 +60,16 @@ public:
   Material::Table materialTable;
   Endgames endgames;
   size_t idx, PVIdx;
-  int maxPly, callsCnt;
-  std::atomic<uint64_t> tbHits;
-  std::atomic<uint64_t> nodes;
+  int selDepth;
+  std::atomic<uint64_t> nodes, tbHits;
 
   Position rootPos;
   Search::RootMoves rootMoves;
-  std::atomic<Depth> rootDepth;
+  Depth rootDepth;
   Depth completedDepth;
-  std::atomic_bool resetCalls;
-  CounterMoveStat counterMoves;
-  ButterflyHistory history;
-  CounterMoveHistoryStat counterMoveHistory;
+  CounterMoveHistory counterMoves;
+  ButterflyHistory mainHistory;
+  ContinuationHistory contHistory;
 };
 
 
@@ -79,10 +77,12 @@ public:
 
 struct MainThread : public Thread {
   virtual void search();
+  void check_time();
 
   bool easyMovePlayed, failedLow;
   double bestMoveChanges;
   Value previousScore;
+  int callsCnt = 0;
 };
 
 
@@ -101,6 +101,8 @@ struct ThreadPool : public std::vector<Thread*> {
   uint64_t nodes_searched() const;
   uint64_t tb_hits() const;
 
+  std::atomic_bool stop, stopOnPonderhit;
+
 private:
   StateListPtr setupStates;
 };