X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=beb09e4d5df5700a212bb08db0b84e5a7c161a9a;hp=6bccde4c4671425cbd1f1c279c3e1f9c6a5b2f75;hb=eeef654cd78853c966efe38daf97494bb4caeab1;hpb=a29dd88f7563c5af871d9adc137218c39586b09c diff --git a/src/thread.h b/src/thread.h index 6bccde4c..beb09e4d 100644 --- a/src/thread.h +++ b/src/thread.h @@ -20,7 +20,6 @@ #if !defined(THREAD_H_INCLUDED) #define THREAD_H_INCLUDED -#include #include #include "lock.h" @@ -51,12 +50,12 @@ struct SplitPoint { // Shared data Lock lock; + volatile uint64_t slavesMask; volatile int64_t nodes; volatile Value alpha; volatile Value bestValue; volatile int moveCount; volatile bool is_betaCutoff; - volatile bool is_slave[MAX_THREADS]; }; @@ -70,7 +69,7 @@ struct Thread { void wake_up(); bool cutoff_occurred() const; bool is_available_to(int master) const; - void idle_loop(SplitPoint* sp); + void idle_loop(SplitPoint* sp_master); void main_loop(); void timer_loop(); @@ -81,17 +80,12 @@ struct Thread { int maxPly; Lock sleepLock; WaitCondition sleepCond; + ThreadHandle handle; SplitPoint* volatile splitPoint; volatile int activeSplitPoints; volatile bool is_searching; volatile bool do_sleep; - volatile bool do_terminate; - -#if defined(_MSC_VER) - HANDLE handle; -#else - pthread_t handle; -#endif + volatile bool do_exit; }; @@ -116,12 +110,11 @@ public: void set_size(int cnt); void read_uci_options(); bool available_slave_exists(int master) const; - bool split_point_finished(SplitPoint* sp) const; void set_timer(int msec); void wait_for_stop_or_ponderhit(); void stop_thinking(); void start_thinking(const Position& pos, const Search::LimitsType& limits, - const std::set& searchMoves, bool asyncMode); + const std::set& = std::set(), bool async = false); template Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue,