X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=786c5b677c1934a2dfd0c9aa6ab09870f87b052b;hp=793a3c606797c573131fe5f59cbc4e6c915c4b6e;hb=1a414cd9cb274d9572c60fe4067671cd993ffb36;hpb=588670e8d2ed5735300c5549ef754ceb09f1f461

diff --git a/src/thread.h b/src/thread.h
index 793a3c60..786c5b67 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -63,19 +63,19 @@ struct SplitPoint {
   // Const data after split point has been setup
   const Position* pos;
   const Search::Stack* ss;
+  Thread* masterThread;
   Depth depth;
   Value beta;
   int nodeType;
-  Thread* master;
   Move threatMove;
 
   // Const pointers to shared data
-  MovePicker* mp;
-  SplitPoint* parent;
+  MovePicker* movePicker;
+  SplitPoint* parentSplitPoint;
 
   // Shared data
   Mutex mutex;
-  Position* activePositions[MAX_THREADS];
+  Position* slavesPositions[MAX_THREADS];
   volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
@@ -102,6 +102,10 @@ struct Thread {
   bool is_available_to(Thread* master) const;
   void wait_for(volatile const bool& b);
 
+  template <bool Fake>
+  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
+              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
+
   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
   Material::Table materialTable;
   Endgames endgames;
@@ -111,14 +115,14 @@ struct Thread {
   Mutex mutex;
   ConditionVariable sleepCondition;
   NativeHandle handle;
-  SplitPoint* volatile curSplitPoint;
-  volatile int splitPointsCnt;
+  SplitPoint* volatile activeSplitPoint;
+  volatile int splitPointsSize;
   volatile bool searching;
   volatile bool exit;
 };
 
 
-/// MainThread and TimerThread are sublassed from Thread to charaterize the two
+/// MainThread and TimerThread are sublassed from Thread to characterize the two
 /// special threads: the main one and the recurring timer.
 
 struct MainThread : public Thread {
@@ -134,44 +138,28 @@ struct TimerThread : public Thread {
 };
 
 
-/// ThreadPool class handles all the threads related stuff like init, starting,
+/// ThreadPool struct handles 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 ThreadPool {
+struct ThreadPool : public std::vector<Thread*> {
 
-public:
   void init(); // No c'tor and d'tor, threads rely on globals that should
   void exit(); // be initialized and valid during the whole thread lifetime.
 
-  Thread& operator[](size_t id) { return *threads[id]; }
-  size_t size() const { return threads.size(); }
-  MainThread* main_thread() { return static_cast<MainThread*>(threads[0]); }
-  TimerThread* timer_thread() { return timer; }
-
+  MainThread* main_thread() { return static_cast<MainThread*>((*this)[0]); }
   void read_uci_options();
-  bool available_slave_exists(Thread* master) const;
+  bool slave_available(Thread* master) const;
   void wait_for_think_finished();
   void start_thinking(const Position&, const Search::LimitsType&,
-                       const std::vector<Move>&, Search::StateStackPtr&);
-
-  template <bool Fake>
-  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
-              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
+                      const std::vector<Move>&, Search::StateStackPtr&);
 
   bool sleepWhileIdle;
   Depth minimumSplitDepth;
-
-private:
-  friend struct Thread;
-  friend struct MainThread;
-  friend void check_time();
-
-  std::vector<Thread*> threads;
-  TimerThread* timer;
+  size_t maxThreadsPerSplitPoint;
   Mutex mutex;
   ConditionVariable sleepCondition;
-  int maxThreadsPerSplitPoint;
+  TimerThread* timer;
 };
 
 extern ThreadPool Threads;