Don't use do_sleep flag

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 5feab00072be92c2505f635c0d0800c2ca935e8c..2fc958c1ceb681c4b3652816ff0f8e1494e34130 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -28,7 +28,7 @@
 #include "position.h"
 #include "search.h"
 
-const int MAX_THREADS = 32;
+const int MAX_THREADS = 64; // Because SplitPoint::slavesMask is a uint64_t
 const int MAX_SPLITPOINTS_PER_THREAD = 8;
 
 struct Mutex {
@@ -75,6 +75,7 @@ struct SplitPoint {
 
   // Shared data
   Mutex mutex;
+  Position* activePositions[MAX_THREADS];
   volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
@@ -98,17 +99,18 @@ public:
   Thread(Fn fn);
  ~Thread();
 
-  void wake_up();
+  void notify_one();
   bool cutoff_occurred() const;
   bool is_available_to(Thread* master) const;
   void idle_loop();
   void main_loop();
   void timer_loop();
-  void wait_for_stop_or_ponderhit();
+  void wait_for(volatile const bool& b);
 
   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
-  MaterialTable materialTable;
-  PawnTable pawnTable;
+  Material::Table materialTable;
+  Endgames endgames;
+  Pawns::Table pawnsTable;
   size_t idx;
   int maxPly;
   Mutex mutex;
@@ -118,7 +120,7 @@ public:
   SplitPoint* volatile curSplitPoint;
   volatile int splitPointsCnt;
   volatile bool is_searching;
-  volatile bool do_sleep;
+  volatile bool is_finished;
   volatile bool do_exit;
 };
 
@@ -130,29 +132,27 @@ public:
 class ThreadPool {
 
 public:
-  void init(); // No c'tor, Threads object is global and engine shall be fully initialized
- ~ThreadPool();
+  void init(); // No c'tor and d'tor, threads rely on globals that should
+  void exit(); // be initialized and valid during the whole thread lifetime.
 
   Thread& operator[](size_t id) { return *threads[id]; }
-  bool use_sleeping_threads() const { return useSleepingThreads; }
   int min_split_depth() const { return minimumSplitDepth; }
   size_t size() const { return threads.size(); }
   Thread* main_thread() { return threads[0]; }
+  Thread* timer_thread() { return timer; }
 
-  void wake_up() const;
-  void sleep() const;
   void read_uci_options();
   bool available_slave_exists(Thread* master) const;
-  void set_timer(int msec);
   void wait_for_search_finished();
-  void start_searching(const Position& pos, const Search::LimitsType& limits,
-                       const std::vector<Move>& searchMoves);
+  void start_searching(const Position&, const Search::LimitsType&,
+                       const std::vector<Move>&, Search::StateStackPtr&);
 
   template <bool Fake>
   Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
-              Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
+              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
 private:
   friend class Thread;
+  friend void check_time();
 
   std::vector<Thread*> threads;
   Thread* timer;
@@ -160,7 +160,8 @@ private:
   ConditionVariable sleepCondition;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
-  bool useSleepingThreads;
+public:
+  bool sleepWhileIdle;
 };
 
 extern ThreadPool Threads;