X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=ad40a34146bbd8e8b8fe0f80be4dcc23b5dd7d44;hp=4b712076083b701ee23183e9a352d0ecfc2b6da6;hb=7a2825053e3eb5204e6b45d0cadb9264e77ac69f;hpb=c483ffc773c012b49f4ea2f5bd1d788c1f0dc4ac

diff --git a/src/thread.h b/src/thread.h
index 4b712076..ad40a341 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -20,7 +20,6 @@
 #if !defined(THREAD_H_INCLUDED)
 #define THREAD_H_INCLUDED
 
-#include <set>
 #include <vector>
 
 #include "material.h"
@@ -32,6 +31,8 @@
 const int MAX_THREADS = 32;
 const int MAX_SPLITPOINTS_PER_THREAD = 8;
 
+class Thread;
+
 struct SplitPoint {
 
   // Const data after split point has been setup
@@ -40,14 +41,13 @@ struct SplitPoint {
   Depth depth;
   Value beta;
   int nodeType;
-  int master;
+  Thread* master;
   Move threatMove;
 
   // Const pointers to shared data
   MovePicker* mp;
   SplitPoint* parent;
 
-
   // Shared data
   Lock lock;
   volatile uint64_t slavesMask;
@@ -67,28 +67,24 @@ struct SplitPoint {
 
 class Thread {
 
-  Thread(const Thread&);            // Only declared to disable the default ones
-  Thread& operator=(const Thread&); // that are not suitable in this case.
-
-  typedef void (Thread::* Fn) ();
+  typedef void (Thread::* Fn) (); // Pointer to member function
 
 public:
   Thread(Fn fn);
-  ~Thread();
+ ~Thread();
 
   void wake_up();
   bool cutoff_occurred() const;
-  bool is_available_to(int master) const;
-  void idle_loop(SplitPoint* sp_master);
-  void idle_loop() { idle_loop(NULL); } // Hack to allow storing in start_fn
+  bool is_available_to(Thread* master) const;
+  void idle_loop();
   void main_loop();
   void timer_loop();
   void wait_for_stop_or_ponderhit();
 
   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
-  MaterialInfoTable materialTable;
-  PawnInfoTable pawnTable;
-  int threadID;
+  MaterialTable materialTable;
+  PawnTable pawnTable;
+  size_t idx;
   int maxPly;
   Lock sleepLock;
   WaitCondition sleepCond;
@@ -102,32 +98,30 @@ public:
 };
 
 
-/// ThreadsManager class handles all the threads related stuff like init, starting,
+/// ThreadPool class 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 ThreadsManager {
-  /* As long as the single ThreadsManager object is defined as a global we don't
-     need to explicitly initialize to zero its data members because variables with
-     static storage duration are automatically set to zero before enter main()
-  */
+class ThreadPool {
+
 public:
-  void init();
-  void exit();
+  void init(); // No c'tor, Threads object is global and engine shall be fully initialized
+  ~ThreadPool();
 
-  Thread& operator[](int id) { return *threads[id]; }
+  Thread& operator[](size_t id) { return *threads[id]; }
   bool use_sleeping_threads() const { return useSleepingThreads; }
   int min_split_depth() const { return minimumSplitDepth; }
-  int size() const { return (int)threads.size(); }
+  size_t size() const { return threads.size(); }
+  Thread* main_thread() { return threads[0]; }
 
-  void wake_up();
-  void sleep();
+  void wake_up() const;
+  void sleep() const;
   void read_uci_options();
-  bool available_slave_exists(int master) const;
+  bool available_slave_exists(Thread* master) const;
   void set_timer(int msec);
-  void stop_thinking();
-  void start_thinking(const Position& pos, const Search::LimitsType& limits,
-                      const std::set<Move>& = std::set<Move>(), bool async = false);
+  void wait_for_search_finished();
+  void start_searching(const Position& pos, const Search::LimitsType& limits,
+                       const std::vector<Move>& searchMoves);
 
   template <bool Fake>
   Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
@@ -144,6 +138,6 @@ private:
   bool useSleepingThreads;
 };
 
-extern ThreadsManager Threads;
+extern ThreadPool Threads;
 
 #endif // !defined(THREAD_H_INCLUDED)