X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=3f902dc17b794a35250f87759e932dd9f0607bd4;hp=80363fa7f187aac9c65cec13314a879b2c4807a9;hb=60c121f3b1ee7d5ced3435cc1718e4e6e6fd8383;hpb=3d937e1e901c59c04cd5d602c05f72892222ded8

diff --git a/src/thread.h b/src/thread.h
index 80363fa7..3f902dc1 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, 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,45 +17,71 @@
   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 <set>
+#include <bitset>
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#include <vector>
 
-#include "lock.h"
 #include "material.h"
 #include "movepick.h"
 #include "pawns.h"
 #include "position.h"
 #include "search.h"
 
-const int MAX_THREADS = 32;
-const int MAX_ACTIVE_SPLIT_POINTS = 8;
+struct Thread;
+
+const int MAX_THREADS = 128;
+const int MAX_SPLITPOINTS_PER_THREAD = 8;
+
+/// SplitPoint struct stores information shared by the threads searching in
+/// parallel below the same split point. It is populated at splitting time.
 
 struct SplitPoint {
 
-  // Const data after splitPoint has been setup
-  SplitPoint* parent;
+  // Const data after split point has been setup
   const Position* pos;
+  Search::Stack* ss;
+  Thread* masterThread;
   Depth depth;
   Value beta;
   int nodeType;
-  int ply;
-  int master;
-  Move threatMove;
+  bool cutNode;
 
   // Const pointers to shared data
-  MovePicker* mp;
-  Search::Stack* ss;
-
-  // Shared data
-  Lock lock;
-  volatile int64_t nodes;
+  MovePicker* movePicker;
+  SplitPoint* parentSplitPoint;
+
+  // Shared variable data
+  std::mutex mutex;
+  std::bitset<MAX_THREADS> slavesMask;
+  volatile bool allSlavesSearching;
+  volatile uint64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
+  volatile Move bestMove;
   volatile int moveCount;
-  volatile bool is_betaCutoff;
-  volatile bool is_slave[MAX_THREADS];
+  volatile bool cutoff;
+};
+
+
+/// ThreadBase struct is the base of the hierarchy from where we derive all the
+/// specialized thread classes.
+
+struct ThreadBase {
+
+  virtual ~ThreadBase() = default;
+  virtual void idle_loop() = 0;
+  void notify_one();
+  void wait_for(volatile const bool& b);
+
+  std::thread nativeThread;
+  std::mutex mutex;
+  std::condition_variable sleepCondition;
+  volatile bool exit = false;
 };
 
 
@@ -64,74 +90,68 @@ struct SplitPoint {
 /// 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 {
+struct Thread : public ThreadBase {
 
-  void wake_up();
+  Thread();
+  virtual void idle_loop();
   bool cutoff_occurred() const;
-  bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp);
-  void main_loop();
-  void timer_loop();
-
-  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
-  MaterialInfoTable materialTable;
-  PawnInfoTable pawnTable;
-  int threadID;
+  bool available_to(const Thread* master) const;
+
+  void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
+             Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);
+
+  SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
+  Pawns::Table pawnsTable;
+  Material::Table materialTable;
+  Endgames endgames;
+  Position* activePosition;
+  size_t idx;
   int maxPly;
-  Lock sleepLock;
-  WaitCondition sleepCond;
-  ThreadHandle handle;
-  SplitPoint* volatile splitPoint;
-  volatile int activeSplitPoints;
-  volatile bool is_searching;
-  volatile bool do_sleep;
-  volatile bool do_terminate;
+  SplitPoint* volatile activeSplitPoint;
+  volatile int splitPointsSize;
+  volatile bool searching;
 };
 
 
-/// ThreadsManager class handles all the threads related stuff like init, starting,
-/// parking and, the most important, launching a slave thread at a split point.
+/// MainThread and TimerThread are derived classes used to characterize the two
+/// special threads: the main one and the recurring timer.
+
+struct MainThread : public Thread {
+  virtual void idle_loop();
+  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;
+};
+
+
+/// ThreadPool struct handles all the threads related stuff like init, starting,
+/// parking and, most importantly, launching a slave thread at a split point.
 /// All the access to shared thread data is done through this class.
 
-class ThreadsManager {
-  /* As long as the single ThreadsManager object is defined as a global we don't
-     need to explicitly initialize to zero its data members because variables with
-     static storage duration are automatically set to zero before enter main()
-  */
-public:
-  Thread& operator[](int threadID) { return threads[threadID]; }
-  void init();
-  void exit();
-
-  bool use_sleeping_threads() const { return useSleepingThreads; }
-  int min_split_depth() const { return minimumSplitDepth; }
-  int size() const { return activeThreads; }
-
-  void set_size(int cnt);
+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.
+
+  MainThread* main() { return static_cast<MainThread*>(at(0)); }
   void read_uci_options();
-  bool available_slave_exists(int master) const;
-  bool split_point_finished(SplitPoint* sp) const;
-  void set_timer(int msec);
-  void wait_for_stop_or_ponderhit();
-  void stop_thinking();
-  void start_thinking(const Position& pos, const Search::LimitsType& limits,
-                      const std::set<Move>& = std::set<Move>(), bool async = false);
-
-  template <bool Fake>
-  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue,
-              Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
-private:
-  friend struct Thread;
-
-  Thread threads[MAX_THREADS + 1]; // Last one is used as a timer
-  Lock threadsLock;
+  Thread* available_slave(const Thread* master) const;
+  void wait_for_think_finished();
+  void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
+
   Depth minimumSplitDepth;
-  int maxThreadsPerSplitPoint;
-  int activeThreads;
-  bool useSleepingThreads;
-  WaitCondition sleepCond;
+  std::mutex mutex;
+  std::condition_variable sleepCondition;
+  TimerThread* timer;
 };
 
-extern ThreadsManager Threads;
+extern ThreadPool Threads;
 
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED