X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=df42c5aa756d0ff11ceb9cc34e720c5827d2ae8e;hp=3a2d8538b0a84d73ba50b5caf7bc42a138ab00ba;hb=ffa75215cc06d105bc2b43ddb8ed5d4deccd8988;hpb=ba85c59d96d962dddaa0f1a2608ebea2e8ae694b

diff --git a/src/thread.h b/src/thread.h
index 3a2d8538..df42c5aa 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -27,6 +27,7 @@
 #include "movepick.h"
 #include "pawns.h"
 #include "position.h"
+#include "search.h"
 
 const int MAX_THREADS = 32;
 const int MAX_ACTIVE_SPLIT_POINTS = 8;
@@ -65,19 +66,12 @@ struct SplitPoint {
 
 struct Thread {
 
-  enum ThreadState
-  {
-    INITIALIZING,  // Thread is initializing itself
-    SEARCHING,     // Thread is performing work
-    AVAILABLE,     // Thread is waiting for work
-    WORKISWAITING, // Master has ordered us to start searching
-    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 main_loop();
+  void timer_loop();
 
   SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
   MaterialInfoTable materialTable;
@@ -86,11 +80,17 @@ 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;
+
+#if defined(_MSC_VER)
+  HANDLE handle;
+#else
+  pthread_t handle;
+#endif
 };
 
 
@@ -107,7 +107,6 @@ 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; }
@@ -116,17 +115,25 @@ 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 start_thinking(bool asyncMode = true);
+  void set_timer(int msec);
+  void wait_for_stop_or_ponderhit();
 
   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;
 };
 
 extern ThreadsManager Threads;