Revert "Fix a race on Limits::ponder"

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index fd28ddf7d390717d51782792f3baf9d5361f34b4..c1b635b7ea4db61dfca33ed0ee3423e3eeefb862 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  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
@@ -17,64 +18,95 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
 #define THREAD_H_INCLUDED
 
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#include <vector>
 
-////
-//// Includes
-////
-
-#include "lock.h"
+#include "material.h"
 #include "movepick.h"
+#include "pawns.h"
 #include "position.h"
 #include "search.h"
+#include "thread_win32.h"
+
+
+/// 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.
+
+class Thread {
+
+  std::thread nativeThread;
+  Mutex mutex;
+  ConditionVariable sleepCondition;
+  bool exit, searching;
+
+public:
+  Thread();
+  virtual ~Thread();
+  virtual void search();
+  void idle_loop();
+  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 selDepth;
+  std::atomic<uint64_t> nodes, tbHits;
+
+  Position rootPos;
+  Search::RootMoves rootMoves;
+  Depth rootDepth;
+  Depth completedDepth;
+  CounterMoveHistory counterMoves;
+  ButterflyHistory mainHistory;
+  ContinuationHistory contHistory;
+};
+
+
+/// MainThread is a derived class with a specific overload for the main thread
 
+struct MainThread : public Thread {
+  virtual void search();
+  void check_time();
 
-////
-//// Constants and variables
-////
-
-const int THREAD_MAX = 8;
-
-
-////
-//// Types
-////
-
-struct SplitPoint {
-  SplitPoint *parent;
-  Position pos;
-  SearchStack sstack[THREAD_MAX][PLY_MAX_PLUS_2];
-  SearchStack *parentSstack;
-  int ply;
-  Depth depth;
-  volatile Value alpha, beta, bestValue, futilityValue;
-  Value approximateEval;
-  bool pvNode;
-  int master, slaves[THREAD_MAX];
-  Lock lock;
-  MovePicker *mp;
-  volatile int moves;
-  volatile int cpus;
-  bool finished;
+  bool easyMovePlayed, failedLow;
+  double bestMoveChanges;
+  Value previousScore;
+  int callsCnt = 0;
 };
 
 
-struct Thread {
-  SplitPoint *splitPoint;
-  int activeSplitPoints;
-  uint64_t nodes;
-  uint64_t betaCutOffs[2];
-  bool failHighPly1;
-  volatile bool stop;
-  volatile bool running;
-  volatile bool idle;
-  volatile bool workIsWaiting;
-  volatile bool printCurrentLine;
-  unsigned char pad[64]; // set some distance among local data for each thread
+/// 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*> {
+
+  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 start_thinking(Position&, StateListPtr&, const Search::LimitsType&);
+  void read_uci_options();
+  uint64_t nodes_searched() const;
+  uint64_t tb_hits() const;
+
+  std::atomic_bool stop, stopOnPonderhit;
+
+private:
+  StateListPtr setupStates;
 };
 
+extern ThreadPool Threads;
 
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED