X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=e2009a7d78b98cd6411391c49c2f8c4b50f408e3;hp=6cceca7244f59b44205105aa26f3595217751ec4;hb=b53239d6410cfc87bf454370671390b04879ef05;hpb=9c9205860c5ab0e4f3180298e3f7082be259772c

diff --git a/src/thread.h b/src/thread.h
index 6cceca72..e2009a7d 100644
--- 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,75 +35,88 @@
 #include "thread_win32.h"
 
 
-/// ThreadBase struct is the base of the hierarchy from where we derive all the
-/// specialized thread classes.
+/// Thread class keeps together all the thread-related stuff. We 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 ThreadBase : public std::thread {
-
-  ThreadBase() { exit = false; }
-  virtual ~ThreadBase() = default;
-  virtual void idle_loop() = 0;
-  void notify_one();
-  void wait(std::atomic_bool& b);
-  void wait_while(std::atomic_bool& b);
+class Thread {
 
   Mutex mutex;
-  ConditionVariable sleepCondition;
-  std::atomic_bool exit;
-};
-
-
-/// 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.
-
-struct Thread : public ThreadBase {
-
-  Thread();
-  virtual void idle_loop();
-  void search(bool isMainThread = false);
+  ConditionVariable cv;
+  size_t idx;
+  bool exit = false, searching = true; // Set before starting std::thread
+  std::thread stdThread;
+
+public:
+  explicit Thread(size_t);
+  virtual ~Thread();
+  virtual void search();
+  void clear();
+  void idle_loop();
+  void start_searching();
+  void wait_for_search_finished();
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
   Endgames endgames;
-  size_t idx, PVIdx;
-  int maxPly, callsCnt;
-  std::atomic_bool searching, resetCallsCnt;
+  size_t PVIdx;
+  int selDepth, nmp_ply, pair;
+  std::atomic<uint64_t> nodes, tbHits;
 
   Position rootPos;
-  Search::RootMoveVector rootMoves;
-  Depth rootDepth;
-  HistoryStats history;
-  MovesStats counterMoves;
-  Depth completedDepth;
+  Search::RootMoves rootMoves;
+  Depth rootDepth, completedDepth;
+  CounterMoveHistory counterMoves;
+  ButterflyHistory mainHistory;
+  CapturePieceToHistory captureHistory;
+  ContinuationHistory contHistory;
 };
 
 
-/// MainThread is a derived classes used to characterize the the main one
+/// MainThread is a derived class specific for main thread
 
 struct MainThread : public Thread {
-  MainThread() { thinking = true; } // Avoid a race with start_thinking()
-  virtual void idle_loop();
-  void join();
-  void think();
-  std::atomic_bool thinking;
+
+  using Thread::Thread;
+
+  void search() override;
+  void check_time();
+
+  bool failedLow;
+  double bestMoveChanges, previousTimeReduction;
+  Value previousScore;
+  int callsCnt;
 };
 
 
-/// 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
+/// is done through this class.
 
 struct ThreadPool : public std::vector<Thread*> {
 
-  void init(); // No constructor and destructor, threads rely on globals that should
-  void exit(); // be initialized and valid during the whole thread lifetime.
+  void init(size_t); // No constructor and destructor, threads rely on globals that should
+  void exit();       // be initialized and valid during the whole thread lifetime.
+  void start_thinking(Position&, StateListPtr&, const Search::LimitsType&, bool = false);
+  void set(size_t);
+
+  MainThread* main()        const { return static_cast<MainThread*>(front()); }
+  uint64_t nodes_searched() const { return accumulate(&Thread::nodes); }
+  uint64_t tb_hits()        const { return accumulate(&Thread::tbHits); }
+
+  std::atomic_bool stop, ponder, stopOnPonderhit;
+
+private:
+  StateListPtr setupStates;
+
+  uint64_t accumulate(std::atomic<uint64_t> Thread::* member) const {
 
-  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();
+    uint64_t sum = 0;
+    for (Thread* th : *this)
+        sum += (th->*member).load(std::memory_order_relaxed);
+    return sum;
+  }
 };
 
 extern ThreadPool Threads;