Remove killer move conditions from LMR

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 0567f5e24828f3edcfa9c63677b9e0ca3da02794..ee032bf37835eebbe8a836de9566de9282e1383b 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -40,20 +40,22 @@
 /// entry its life time is unlimited and we don't have to care about someone
 /// changing the entry under our feet.
 
-struct Thread : public std::thread {
+class Thread {
 
+  std::thread nativeThread;
+  Mutex mutex;
+  ConditionVariable sleepCondition;
+  bool exit, searching;
+
+public:
   Thread();
   virtual ~Thread();
   virtual void search();
   void idle_loop();
-  void join();
-  void notify_one();
+  void start_searching(bool resume = false);
+  void wait_for_search_finished();
   void wait(std::atomic_bool& b);
 
-  std::atomic_bool exit, searching, resetCalls;
-  Mutex mutex;
-  ConditionVariable sleepCondition;
-
   Pawns::Table pawnsTable;
   Material::Table materialTable;
   Endgames endgames;
@@ -66,10 +68,11 @@ struct Thread : public std::thread {
   HistoryStats history;
   MovesStats counterMoves;
   Depth completedDepth;
+  std::atomic_bool resetCalls;
 };
 
 
-/// MainThread is a derived classes used to characterize the the main one
+/// MainThread is a derived class with a specific overload for the main thread
 
 struct MainThread : public Thread {
   virtual void search();
@@ -77,8 +80,8 @@ struct MainThread : public Thread {
 
 
 /// ThreadPool struct handles all the threads related stuff like init, starting,
-/// parking and, most importantly, launching a thread.
-/// All the access to shared thread data is done through this class.
+/// parking and, most importantly, launching a thread. All the access to threads
+/// data is done through this class.
 
 struct ThreadPool : public std::vector<Thread*> {
 
@@ -86,8 +89,8 @@ struct ThreadPool : public std::vector<Thread*> {
   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&);
+  void read_uci_options();
   int64_t nodes_searched();
 };