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

diff --git a/src/thread.h b/src/thread.h
index 13121ca1..3a2d8538 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -37,8 +37,8 @@ struct SplitPoint {
   SplitPoint* parent;
   const Position* pos;
   Depth depth;
-  bool pvNode;
   Value beta;
+  int nodeType;
   int ply;
   int master;
   Move threatMove;
@@ -70,24 +70,27 @@ struct Thread {
     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
+    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);
 
+  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;
-  SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
+  volatile bool do_sleep;
+  volatile bool do_terminate;
 };
 
 
@@ -106,25 +109,24 @@ public:
   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:
-  Lock mpLock;
+  Thread threads[MAX_THREADS];
+  Lock threadsLock;
   Depth minimumSplitDepth;
   int maxThreadsPerSplitPoint;
-  bool useSleepingThreads;
   int activeThreads;
-  volatile bool allThreadsShouldExit;
-  Thread threads[MAX_THREADS];
+  bool useSleepingThreads;
 };
 
 extern ThreadsManager Threads;