Fix regression: engine hangs while pondering

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index 574c596481a81388f5ec61632166dc8d6b15a0bc..e6d400942c3a3cf9102496f783d6a06473fe4b46 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -65,17 +65,12 @@ struct SplitPoint {
 
 struct Thread {
 
-  enum ThreadState
-  {
-    AVAILABLE,     // Thread is waiting for work
-    WORKISWAITING, // Master has ordered us to start searching
-    SEARCHING      // Thread is performing work
-  };
-
   void wake_up();
   bool cutoff_occurred() const;
   bool is_available_to(int master) const;
   void idle_loop(SplitPoint* sp);
+  void listener_loop();
+  void timer_loop();
 
   SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
   MaterialInfoTable materialTable;
@@ -84,9 +79,9 @@ struct Thread {
   int maxPly;
   Lock sleepLock;
   WaitCondition sleepCond;
-  volatile ThreadState state;
   SplitPoint* volatile splitPoint;
   volatile int activeSplitPoints;
+  volatile bool is_searching;
   volatile bool do_sleep;
   volatile bool do_terminate;
 
@@ -119,17 +114,27 @@ 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 getline(std::string& cmd);
+  void start_listener();
+  void stop_listener();
+  void set_timer(int msec);
 
   template <bool Fake>
   Value split(Position& pos, SearchStack* ss, Value alpha, Value beta, Value bestValue,
               Depth depth, Move threatMove, int moveCount, MovePicker* mp, int nodeType);
 private:
-  Thread threads[MAX_THREADS];
+  friend struct Thread;
+
+  Thread threads[MAX_THREADS + 2]; // Last 2 are the listener and the timer
   Lock threadsLock;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
   int activeThreads;
   bool useSleepingThreads;
+  WaitCondition sleepCond;
+  std::string inputLine;
 };
 
 extern ThreadsManager Threads;