X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=46c40d9bfdab92e3fe3d655f4d50e03629511c3a;hp=9b0a8bcf7965d42ba2e226d43a894b06afcb1b63;hb=3b8f66f8accefe86db9296fa276e4b33cdc450e2;hpb=3d0d0237c52474fa7b5e4d9f52d985a69d87df2c diff --git a/src/thread.h b/src/thread.h index 9b0a8bcf..46c40d9b 100644 --- a/src/thread.h +++ b/src/thread.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ #if !defined(THREAD_H_INCLUDED) #define THREAD_H_INCLUDED -#include #include #include "material.h" @@ -29,26 +28,54 @@ #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 { + Mutex() { lock_init(l); } + ~Mutex() { lock_destroy(l); } + + void lock() { lock_grab(l); } + void unlock() { lock_release(l); } + +private: + friend struct ConditionVariable; + + Lock l; +}; + +struct ConditionVariable { + ConditionVariable() { cond_init(c); } + ~ConditionVariable() { cond_destroy(c); } + + void wait(Mutex& m) { cond_wait(c, m.l); } + void wait_for(Mutex& m, int ms) { timed_wait(c, m.l, ms); } + void notify_one() { cond_signal(c); } + +private: + WaitCondition c; +}; + +struct Thread; + struct SplitPoint { // Const data after split point has been setup const Position* pos; const Search::Stack* ss; + Thread* masterThread; Depth depth; Value beta; int nodeType; - int master; Move threatMove; + bool cutNode; // Const pointers to shared data - MovePicker* mp; - SplitPoint* parent; + MovePicker* movePicker; + SplitPoint* parentSplitPoint; // Shared data - Lock lock; + Mutex mutex; volatile uint64_t slavesMask; volatile int64_t nodes; volatile Value alpha; @@ -64,85 +91,78 @@ 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 { - - 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) (); +struct Thread { -public: - Thread(Fn fn); - ~Thread(); + Thread(); + virtual ~Thread(); - void wake_up(); + virtual void idle_loop(); + void notify_one(); 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 - void main_loop(); - void timer_loop(); - void wait_for_stop_or_ponderhit(); + bool is_available_to(Thread* master) const; + void wait_for(volatile const bool& b); + + template + void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove, + Depth depth, Move threatMove, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode); SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD]; - MaterialInfoTable materialTable; - PawnInfoTable pawnTable; - int threadID; + Material::Table materialTable; + Endgames endgames; + Pawns::Table pawnsTable; + Position* activePosition; + size_t idx; int maxPly; - Lock sleepLock; - WaitCondition sleepCond; + Mutex mutex; + ConditionVariable sleepCondition; NativeHandle handle; - Fn start_fn; - SplitPoint* volatile curSplitPoint; - volatile int splitPointsCnt; - volatile bool is_searching; - volatile bool do_sleep; - volatile bool do_exit; + SplitPoint* volatile activeSplitPoint; + volatile int splitPointsSize; + volatile bool searching; + volatile bool exit; }; -/// ThreadsManager class handles all the threads related stuff like init, starting, +/// 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(); + volatile bool thinking; +}; + +struct TimerThread : public Thread { + TimerThread() : msec(0) {} + virtual void idle_loop(); + int msec; +}; + + +/// ThreadPool struct 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() - */ -public: - void init(); // No c'tor becuase Threads is static and we need stuff 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(); } - - void wake_up() const; - void sleep() const; - void read_uci_options(); - bool available_slave_exists(int 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& = std::set()); +struct ThreadPool : public std::vector { - 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); -private: - friend class Thread; + void init(); // No c'tor and d'tor, threads rely on globals that should + void exit(); // be initialized and valid during the whole thread lifetime. + + MainThread* main_thread() { return static_cast((*this)[0]); } + void read_uci_options(); + Thread* available_slave(Thread* master) const; + void wait_for_think_finished(); + void start_thinking(const Position&, const Search::LimitsType&, + const std::vector&, Search::StateStackPtr&); - std::vector threads; - Thread* timer; - Lock splitLock; - WaitCondition sleepCond; + bool sleepWhileIdle; Depth minimumSplitDepth; - int maxThreadsPerSplitPoint; - bool useSleepingThreads; + size_t maxThreadsPerSplitPoint; + Mutex mutex; + ConditionVariable sleepCondition; + TimerThread* timer; }; -extern ThreadsManager Threads; +extern ThreadPool Threads; #endif // !defined(THREAD_H_INCLUDED)