Move wait_for_stop_or_ponderhit() under Thread

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 6bccde4c4671425cbd1f1c279c3e1f9c6a5b2f75..dea9d79720112ed77902696b8b45877d77ffd5c0 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -20,7 +20,6 @@
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-#include <cstring>
 #include <set>
 
 #include "lock.h"
@@ -41,7 +40,6 @@ struct SplitPoint {
   Depth depth;
   Value beta;
   int nodeType;
-  int ply;
   int master;
   Move threatMove;
 
@@ -51,12 +49,12 @@ struct SplitPoint {
 
   // Shared data
   Lock lock;
+  volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
-  volatile bool is_betaCutoff;
-  volatile bool is_slave[MAX_THREADS];
+  volatile bool cutoff;
 };
 
 
@@ -70,9 +68,10 @@ struct Thread {
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp);
+  void idle_loop(SplitPoint* sp_master);
   void main_loop();
   void timer_loop();
+  void wait_for_stop_or_ponderhit();
 
   SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
   MaterialInfoTable materialTable;
@@ -81,17 +80,12 @@ struct Thread {
   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;
-
-#if defined(_MSC_VER)
-  HANDLE handle;
-#else
-  pthread_t handle;
-#endif
+  volatile bool do_exit;
 };
 
 
@@ -116,12 +110,10 @@ public:
   void set_size(int cnt);
   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>& searchMoves, bool asyncMode);
+                      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,
@@ -130,12 +122,12 @@ private:
   friend struct Thread;
 
   Thread threads[MAX_THREADS + 1]; // Last one is used as a timer
-  Lock threadsLock;
+  Lock splitLock;
+  WaitCondition sleepCond;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
   int activeThreads;
   bool useSleepingThreads;
-  WaitCondition sleepCond;
 };
 
 extern ThreadsManager Threads;