X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=8b7c0126ce8621882f9176d87107bd83c8f17e0d;hb=ea6c1f7a17572f1cd291ffd00e28cfbd3b2947d5;hp=38a29e8dc00d6c07bd88f097830ff8ce3d378a4c;hpb=8dcb4bc3cce1f487cfac65ed20d21378d0f39b2e;p=stockfish diff --git a/src/thread.h b/src/thread.h index 38a29e8d..8b7c0126 100644 --- a/src/thread.h +++ b/src/thread.h @@ -28,7 +28,7 @@ #include "position.h" #include "search.h" -const int MAX_THREADS = 32; +const int MAX_THREADS = 64; // Because SplitPoint::slavesMask is a uint64_t const int MAX_SPLITPOINTS_PER_THREAD = 8; struct Mutex { @@ -75,6 +75,7 @@ struct SplitPoint { // Shared data Mutex mutex; + Position* activePositions[MAX_THREADS]; volatile uint64_t slavesMask; volatile int64_t nodes; volatile Value alpha; @@ -98,17 +99,18 @@ public: Thread(Fn fn); ~Thread(); - void wake_up(); + void notify_one(); bool cutoff_occurred() const; bool is_available_to(Thread* master) const; void idle_loop(); void main_loop(); void timer_loop(); - void wait_for_stop_or_ponderhit(); + void wait_for(volatile const bool& b); SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD]; - MaterialTable materialTable; - PawnTable pawnTable; + Material::Table materialTable; + Endgames endgames; + Pawns::Table pawnsTable; size_t idx; int maxPly; Mutex mutex; @@ -139,8 +141,6 @@ public: size_t size() const { return threads.size(); } Thread* main_thread() { return threads[0]; } - void wake_up() const; - void sleep() const; void read_uci_options(); bool available_slave_exists(Thread* master) const; void set_timer(int msec); @@ -150,9 +150,10 @@ public: template 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); + Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType); private: friend class Thread; + friend void check_time(); std::vector threads; Thread* timer;