X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=574c596481a81388f5ec61632166dc8d6b15a0bc;hp=100620313fcebc7e7f5f6161fe15b600b0a9929e;hb=e5ffe9959c40a5ec6c4bca83a5a48070cae7fa5b;hpb=d15217b953af28669dd3e5b46303b3ca882f353e

diff --git a/src/thread.h b/src/thread.h
index 10062031..574c5964 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -38,7 +38,7 @@ struct SplitPoint {
   const Position* pos;
   Depth depth;
   Value beta;
-  int pvNode;
+  int nodeType;
   int ply;
   int master;
   Move threatMove;
@@ -67,27 +67,34 @@ 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
+    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);
 
   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 do_sleep;
+  volatile bool do_terminate;
+
+#if defined(_MSC_VER)
+  HANDLE handle;
+#else
+  pthread_t handle;
+#endif
 };
 
 
@@ -104,27 +111,25 @@ 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);
 
   template <bool Fake>
-  void split(Position& pos, SearchStack* ss, Value* alpha, const Value beta, Value* bestValue,
-             Depth depth, Move threatMove, int moveCount, MovePicker* mp, bool pvNode);
+  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];
-  Lock mpLock;
+  Lock threadsLock;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
   int activeThreads;
   bool useSleepingThreads;
-  volatile bool allThreadsShouldExit;
 };
 
 extern ThreadsManager Threads;