X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=6cceca7244f59b44205105aa26f3595217751ec4;hp=459b1ddde9fe11daadd308bb5f717abfcc86dbd8;hb=fca8dbc0295c27ee8b2e3ee8cc217edd36f20127;hpb=307a5a4f63169fd215860dc478dcf2a9db2c46e8

diff --git a/src/thread.h b/src/thread.h
index 459b1ddd..6cceca72 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -34,30 +34,27 @@
 #include "search.h"
 #include "thread_win32.h"
 
-struct Thread;
-
-const size_t MAX_THREADS = 128;
-
 
 /// ThreadBase struct is the base of the hierarchy from where we derive all the
 /// specialized thread classes.
 
 struct ThreadBase : public std::thread {
 
+  ThreadBase() { exit = false; }
   virtual ~ThreadBase() = default;
   virtual void idle_loop() = 0;
   void notify_one();
-  void wait(volatile const bool& b);
-  void wait_while(volatile const bool& b);
+  void wait(std::atomic_bool& b);
+  void wait_while(std::atomic_bool& b);
 
   Mutex mutex;
   ConditionVariable sleepCondition;
-  volatile bool exit = false;
+  std::atomic_bool exit;
 };
 
 
-/// Thread struct keeps together all the thread related stuff like locks, state
-/// and especially split points. We also use per-thread pawn and material hash
+/// Thread struct keeps together all the thread related stuff like locks, state,
+/// history and countermoves tables. We also use per-thread pawn and material hash
 /// tables so that once we get a pointer to an entry its life time is unlimited
 /// and we don't have to care about someone changing the entry under our feet.
 
@@ -71,52 +68,42 @@ struct Thread : public ThreadBase {
   Material::Table materialTable;
   Endgames endgames;
   size_t idx, PVIdx;
-  int maxPly;
-  volatile bool searching;
+  int maxPly, callsCnt;
+  std::atomic_bool searching, resetCallsCnt;
 
   Position rootPos;
   Search::RootMoveVector rootMoves;
   Depth rootDepth;
-  Search::Stack stack[MAX_PLY+4];
   HistoryStats history;
   MovesStats counterMoves;
+  Depth completedDepth;
 };
 
 
-/// MainThread and TimerThread are derived classes used to characterize the two
-/// special threads: the main one and the recurring timer.
+/// MainThread is a derived classes used to characterize the the main one
 
 struct MainThread : public Thread {
+  MainThread() { thinking = true; } // Avoid a race with start_thinking()
   virtual void idle_loop();
   void join();
   void think();
-  volatile bool thinking = true; // Avoid a race with start_thinking()
-};
-
-struct TimerThread : public ThreadBase {
-
-  static const int Resolution = 5; // Millisec between two check_time() calls
-
-  virtual void idle_loop();
-
-  bool run = false;
+  std::atomic_bool thinking;
 };
 
 
 /// ThreadPool struct handles all the threads related stuff like init, starting,
-/// parking and, most importantly, launching a slave thread at a split point.
+/// parking and, most importantly, launching a thread.
 /// All the access to shared thread data is done through this class.
 
 struct ThreadPool : public std::vector<Thread*> {
 
-  void init(); // No c'tor and d'tor, threads rely on globals that should be
-  void exit(); // initialized and are valid during the whole thread lifetime.
+  void init(); // No constructor and destructor, threads rely on globals that should
+  void exit(); // be initialized and valid during the whole thread lifetime.
 
   MainThread* main() { return static_cast<MainThread*>(at(0)); }
   void read_uci_options();
   void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
   int64_t nodes_searched();
-  TimerThread* timer;
 };
 
 extern ThreadPool Threads;