X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=ad17e8b270c788aa79863997db77ea65c4b432aa;hp=9d04e5bddc92d183ec7dc64c6bce2e22233064b8;hb=7062db7cb25a322a3c6bc18b06f1df2dc6431ef8;hpb=d1143794a01cd0540cf47e3415815cd60cde9422

diff --git a/src/thread.h b/src/thread.h
index 9d04e5bd..ad17e8b2 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -56,17 +56,17 @@ private:
   WaitCondition c;
 };
 
-class Thread;
+struct Thread;
 
 struct SplitPoint {
 
   // Const data after split point has been setup
   const Position* pos;
   const Search::Stack* ss;
+  Thread* master;
   Depth depth;
   Value beta;
   int nodeType;
-  Thread* master;
   Move threatMove;
 
   // Const pointers to shared data
@@ -75,7 +75,7 @@ struct SplitPoint {
 
   // Shared data
   Mutex mutex;
-  Position* activePositions[MAX_THREADS];
+  Position* slavesPositions[MAX_THREADS];
   volatile uint64_t slavesMask;
   volatile int64_t nodes;
   volatile Value alpha;
@@ -91,9 +91,8 @@ struct SplitPoint {
 /// 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.
 
-class Thread {
+struct Thread {
 
-public:
   Thread();
   virtual ~Thread();
 
@@ -112,22 +111,26 @@ public:
   Mutex mutex;
   ConditionVariable sleepCondition;
   NativeHandle handle;
-  SplitPoint* volatile curSplitPoint;
-  volatile int splitPointsCnt;
-  volatile bool is_searching;
-  volatile bool do_exit;
+  SplitPoint* volatile activeSplitPoint;
+  volatile int splitPointsSize;
+  volatile bool searching;
+  volatile bool exit;
 };
 
-struct TimerThread : public Thread {
-  TimerThread() : msec(0) {}
+
+/// MainThread and TimerThread are sublassed from Thread to characterize the two
+/// special threads: the main one and the recurring timer.
+
+struct MainThread : public Thread {
+  MainThread() : thinking(true) {} // Avoid a race with start_thinking()
   virtual void idle_loop();
-  int msec;
+  volatile bool thinking;
 };
 
-struct MainThread : public Thread {
-  MainThread() : is_finished(false) {} // Avoid a race with start_searching()
+struct TimerThread : public Thread {
+  TimerThread() : msec(0) {}
   virtual void idle_loop();
-  volatile bool is_finished;
+  int msec;
 };
 
 
@@ -142,33 +145,29 @@ public:
   void exit(); // be initialized and valid during the whole thread lifetime.
 
   Thread& operator[](size_t id) { return *threads[id]; }
-  int min_split_depth() const { return minimumSplitDepth; }
   size_t size() const { return threads.size(); }
   MainThread* main_thread() { return static_cast<MainThread*>(threads[0]); }
   TimerThread* timer_thread() { return timer; }
 
   void read_uci_options();
-  bool available_slave_exists(Thread* master) const;
-  void wait_for_search_finished();
-  void start_searching(const Position&, const Search::LimitsType&,
-                       const std::vector<Move>&, Search::StateStackPtr&);
+  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);
-private:
-  friend class Thread;
-  friend struct MainThread;
-  friend void check_time();
 
-  std::vector<Thread*> threads;
-  TimerThread* timer;
+  bool sleepWhileIdle;
+  Depth minimumSplitDepth;
   Mutex mutex;
   ConditionVariable sleepCondition;
-  Depth minimumSplitDepth;
-  int maxThreadsPerSplitPoint;
-public:
-  bool sleepWhileIdle;
+
+private:
+  std::vector<Thread*> threads;
+  TimerThread* timer;
+  size_t maxThreadsPerSplitPoint;
 };
 
 extern ThreadPool Threads;