Retire ThreadsManager::init_hash_tables()

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index e576a5c4e379017fc9283fbed4e01c7e629c3fef..574c596481a81388f5ec61632166dc8d6b15a0bc 100644 (file)
--- 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;
@@ -53,48 +53,54 @@ struct SplitPoint {
   volatile Value alpha;
   volatile Value bestValue;
   volatile int moveCount;
-  volatile bool betaCutoff;
-  volatile int slaves[MAX_THREADS];
-};
-
-// ThreadState type is used to represent thread's current state
-enum ThreadState
-{
-  THREAD_INITIALIZING,  // thread is initializing itself
-  THREAD_SEARCHING,     // thread is performing work
-  THREAD_AVAILABLE,     // thread is waiting for work
-  THREAD_BOOKED,        // other thread (master) has booked us as a slave
-  THREAD_WORKISWAITING, // master has ordered us to start
-  THREAD_TERMINATED     // we are quitting and thread is terminated
+  volatile bool is_betaCutoff;
+  volatile bool is_slave[MAX_THREADS];
 };
 
 
-// We use per-thread Pawn and material hash tables so that once we get a
-// pointer to an entry its life time is unlimited and we don't have to
-// care about someone changing the entry under our feet.
+/// Thread struct is used to keep together all the thread related stuff like locks,
+/// state and especially split points. We also use per-thread pawn and material hash
+/// tables so that once we get a pointer to an entry its life time is unlimited and
+/// we don't have to care about someone changing the entry under our feet.
 
 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);
+
+  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];
-
-  void wake_up() {
-    lock_grab(&sleepLock);
-    cond_signal(&sleepCond);
-    lock_release(&sleepLock);
-  }
+  volatile bool do_sleep;
+  volatile bool do_terminate;
+
+#if defined(_MSC_VER)
+  HANDLE handle;
+#else
+  pthread_t handle;
+#endif
 };
 
 
-// ThreadsManager class is used to handle all the threads related stuff like init,
-// starting, parking and, the most important, launching a slave thread at a split
-// point. All the access to shared thread data is done through this class.
+/// ThreadsManager class is used to handle all the threads related stuff like init,
+/// starting, parking and, the most important, launching a slave thread at a split
+/// point. All the access to shared thread data is done through this class.
 
 class ThreadsManager {
   /* As long as the single ThreadsManager object is defined as a global we don't
@@ -103,32 +109,29 @@ class ThreadsManager {
   */
 public:
   Thread& operator[](int threadID) { return threads[threadID]; }
-  void init_threads();
-  void exit_threads();
+  void init();
+  void exit();
 
+  bool use_sleeping_threads() const { return useSleepingThreads; }
   int min_split_depth() const { return minimumSplitDepth; }
-  int active_threads() const { return activeThreads; }
-  void set_active_threads(int cnt) { activeThreads = cnt; }
+  int size() const { return activeThreads; }
 
+  void set_size(int cnt);
   void read_uci_options();
-  bool available_thread_exists(int master) const;
-  bool thread_is_available(int slave, int master) const;
-  bool cutoff_at_splitpoint(int threadID) const;
-  void idle_loop(int threadID, SplitPoint* sp);
+  bool available_slave_exists(int master) const;
 
   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 ThreadsMgr;
+extern ThreadsManager Threads;
 
 #endif // !defined(THREAD_H_INCLUDED)