X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=3f3c8c4c0a1614aee6735de0551073ee4c7a358c;hp=9b0a8bcf7965d42ba2e226d43a894b06afcb1b63;hb=699f700162f410519e5510c667aebc9940d4e91e;hpb=3d0d0237c52474fa7b5e4d9f52d985a69d87df2c

diff --git a/src/thread.h b/src/thread.h
index 9b0a8bcf..3f3c8c4c 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,7 +41,7 @@ struct SplitPoint {
   Depth depth;
   Value beta;
   int nodeType;
-  int master;
+  Thread* master;
   Move threatMove;
 
   // Const pointers to shared data
@@ -77,7 +78,7 @@ public:
 
   void wake_up();
   bool cutoff_occurred() const;
-  bool is_available_to(int master) const;
+  bool is_available_to(const Thread& master) const;
   void idle_loop(SplitPoint* sp_master);
   void idle_loop() { idle_loop(NULL); } // Hack to allow storing in start_fn
   void main_loop();
@@ -85,9 +86,9 @@ public:
   void wait_for_stop_or_ponderhit();
 
   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
-  MaterialInfoTable materialTable;
-  PawnInfoTable pawnTable;
-  int threadID;
+  MaterialTable materialTable;
+  PawnTable pawnTable;
+  int idx;
   int maxPly;
   Lock sleepLock;
   WaitCondition sleepCond;
@@ -111,22 +112,25 @@ class ThreadsManager {
      static storage duration are automatically set to zero before enter main()
   */
 public:
-  void init(); // No c'tor becuase Threads is static and we need stuff initialized
+  void init(); // No c'tor becuase Threads is static and we need engine initialized
   ~ThreadsManager();
 
   Thread& operator[](int 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(); }
+  Thread* main_thread() const { return threads[0]; }
+  Thread* this_thread() const { return (Thread*)tls_get(tlsKey); }
+  void set_this_thread(Thread* th) const { tls_set(tlsKey, th); }
 
   void wake_up() const;
   void sleep() const;
   void read_uci_options();
-  bool available_slave_exists(int master) const;
+  bool available_slave_exists(const Thread& master) const;
   void set_timer(int msec);
   void wait_for_search_finished();
   void start_searching(const Position& pos, const Search::LimitsType& limits,
-                       const std::set<Move>& = std::set<Move>());
+                       const std::vector<Move>& searchMoves);
 
   template <bool Fake>
   Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
@@ -136,6 +140,7 @@ private:
 
   std::vector<Thread*> threads;
   Thread* timer;
+  ThreadLocalStorageKey tlsKey;
   Lock splitLock;
   WaitCondition sleepCond;
   Depth minimumSplitDepth;