X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=46ce03aa318c07ea1d66a29a6439b886d4e496c0;hp=6ee07d34668d6bcada9cfdd34473a96135c1d6e2;hb=d58176bfead421088bb3543b3cb6d1c359a3c91b;hpb=5b35c149e833e365c2afb8039ca5c658abc53081

diff --git a/src/thread.h b/src/thread.h
index 6ee07d34..46ce03aa 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -65,29 +65,31 @@ struct SplitPoint {
 
 struct Thread {
 
-  enum ThreadState
-  {
-    INITIALIZING,  // Thread is initializing itself
-    SEARCHING,     // Thread is performing work
-    AVAILABLE,     // Thread is waiting for work
-    BOOKED,        // Other thread (master) has booked us as a slave
-    WORKISWAITING, // Master has ordered us to start
-    TERMINATED     // We are quitting and thread is terminated
-  };
-
   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;
   PawnInfoTable pawnTable;
+  int threadID;
   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;
+
+#if defined(_MSC_VER)
+  HANDLE handle;
+#else
+  pthread_t handle;
+#endif
 };
 
 
@@ -104,27 +106,34 @@ public:
   Thread& operator[](int threadID) { return threads[threadID]; }
   void init();
   void exit();
-  void init_hash_tables();
 
+  bool use_sleeping_threads() const { return useSleepingThreads; }
   int min_split_depth() const { return minimumSplitDepth; }
   int size() const { return activeThreads; }
-  void set_size(int cnt) { activeThreads = cnt; }
 
+  void set_size(int cnt);
   void read_uci_options();
   bool available_slave_exists(int master) const;
-  void idle_loop(int threadID, SplitPoint* sp);
+
+  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;
-  volatile bool allThreadsShouldExit;
+  WaitCondition sleepCond;
+  std::string inputLine;
 };
 
 extern ThreadsManager Threads;