Move stop signal to Threads

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 0567f5e24828f3edcfa9c63677b9e0ca3da02794..77517b07fe85aeb2212bd048a7c792c12c6a32eb 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -2,6 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,7 +22,6 @@
 #define THREAD_H_INCLUDED
 
 #include <atomic>
-#include <bitset>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
@@ -35,50 +35,60 @@
 #include "thread_win32.h"
 
 
-/// Thread struct keeps together all the thread related stuff. We also use
+/// Thread struct keeps together all the thread-related stuff. 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.
 
-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 wait(std::atomic_bool& b);
-
-  std::atomic_bool exit, searching, resetCalls;
-  Mutex mutex;
-  ConditionVariable sleepCondition;
+  void start_searching(bool resume = false);
+  void wait_for_search_finished();
+  void wait(std::atomic_bool& condition);
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
   Endgames endgames;
   size_t idx, PVIdx;
-  int maxPly, callsCnt;
+  int maxPly;
+  std::atomic<uint64_t> nodes, tbHits;
 
   Position rootPos;
-  Search::RootMoveVector rootMoves;
+  Search::RootMoves rootMoves;
   Depth rootDepth;
-  HistoryStats history;
-  MovesStats counterMoves;
   Depth completedDepth;
+  CounterMoveStat counterMoves;
+  ButterflyHistory history;
+  CounterMoveHistoryStat counterMoveHistory;
 };
 
 
-/// 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();
+  void check_time();
+
+  bool easyMovePlayed, failedLow;
+  double bestMoveChanges;
+  Value previousScore;
+  int callsCnt = 0;
 };
 
 
-/// 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.
+/// ThreadPool struct handles all the threads-related stuff like init, starting,
+/// 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,9 +96,15 @@ 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 start_thinking(Position&, StateListPtr&, const Search::LimitsType&);
   void read_uci_options();
-  void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
-  int64_t nodes_searched();
+  uint64_t nodes_searched() const;
+  uint64_t tb_hits() const;
+
+  std::atomic_bool stop, stopOnPonderhit;
+
+private:
+  StateListPtr setupStates;
 };
 
 extern ThreadPool Threads;