X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=e5a198c88e764902d74ff6f509c4ef4075cefbb5;hb=339e1b49f619ceffa75019e196adf4de74b32cce;hp=d06291ebd61526a1a4b672833489ba2979d5c185;hpb=dee878082960be198fdb1493940b3d8a2be0bd58;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index d06291eb..e5a198c8 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,51 +17,35 @@
along with this program. If not, see .
*/
-
#if !defined(THREAD_H_INCLUDED)
#define THREAD_H_INCLUDED
-
-////
-//// Includes
-////
-
#include
#include "lock.h"
+#include "material.h"
#include "movepick.h"
+#include "pawns.h"
#include "position.h"
-#include "search.h"
-
-////
-//// Constants and variables
-////
-
-const int MAX_THREADS = 16;
+const int MAX_THREADS = 32;
const int MAX_ACTIVE_SPLIT_POINTS = 8;
-
-////
-//// Types
-////
-
struct SplitPoint {
// Const data after splitPoint has been setup
SplitPoint* parent;
const Position* pos;
Depth depth;
- bool pvNode, mateThreat;
+ bool pvNode;
Value beta;
int ply;
int master;
Move threatMove;
- SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
// Const pointers to shared data
MovePicker* mp;
- SearchStack* parentSstack;
+ SearchStack* ss;
// Shared data
Lock lock;
@@ -74,7 +58,6 @@ struct SplitPoint {
};
// ThreadState type is used to represent thread's current state
-
enum ThreadState
{
THREAD_INITIALIZING, // thread is initializing itself
@@ -85,12 +68,68 @@ enum ThreadState
THREAD_TERMINATED // we are quitting and thread is terminated
};
+
+// We use per-thread Pawn and material hash 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.
+
struct Thread {
+ MaterialInfoTable materialTable;
+ PawnInfoTable pawnTable;
+ int maxPly;
+ Lock sleepLock;
+ WaitCondition sleepCond;
volatile ThreadState state;
SplitPoint* volatile splitPoint;
volatile int activeSplitPoints;
SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
+
+ void wake_up() {
+ lock_grab(&sleepLock);
+ cond_signal(&sleepCond);
+ lock_release(&sleepLock);
+ }
+};
+
+
+// ThreadsManager class is used to handle 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:
+ Thread& operator[](int threadID) { return threads[threadID]; }
+ void init_threads();
+ void exit_threads();
+ void init_hash_tables();
+
+ int min_split_depth() const { return minimumSplitDepth; }
+ int active_threads() const { return activeThreads; }
+ void set_active_threads(int cnt) { activeThreads = cnt; }
+
+ void read_uci_options();
+ bool available_thread_exists(int master) const;
+ bool thread_is_available(int slave, int master) const;
+ bool cutoff_at_splitpoint(int threadID) const;
+ void idle_loop(int threadID, SplitPoint* sp);
+
+ template
+ void split(Position& pos, SearchStack* ss, Value* alpha, const Value beta, Value* bestValue,
+ Depth depth, Move threatMove, int moveCount, MovePicker* mp, bool pvNode);
+private:
+ Lock mpLock;
+ Depth minimumSplitDepth;
+ int maxThreadsPerSplitPoint;
+ bool useSleepingThreads;
+ int activeThreads;
+ volatile bool allThreadsShouldExit;
+ Thread threads[MAX_THREADS];
};
+extern ThreadsManager ThreadsMgr;
#endif // !defined(THREAD_H_INCLUDED)