X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=d06291ebd61526a1a4b672833489ba2979d5c185;hp=0a28f39bf5dc2f9bbf328acf12192eb5d7b1fe70;hb=dee878082960be198fdb1493940b3d8a2be0bd58;hpb=6716337f407ad6586b636aca72ee673655822137 diff --git a/src/thread.h b/src/thread.h index 0a28f39b..d06291eb 100644 --- a/src/thread.h +++ b/src/thread.h @@ -38,8 +38,8 @@ //// Constants and variables //// -const int MAX_THREADS = 8; -const int ACTIVE_SPLIT_POINTS_MAX = 8; +const int MAX_THREADS = 16; +const int MAX_ACTIVE_SPLIT_POINTS = 8; //// @@ -54,6 +54,9 @@ struct SplitPoint { Depth depth; bool pvNode, mateThreat; Value beta; + int ply; + int master; + Move threatMove; SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2]; // Const pointers to shared data @@ -62,10 +65,11 @@ struct SplitPoint { // Shared data Lock lock; + volatile int64_t nodes; volatile Value alpha; volatile Value bestValue; volatile int moveCount; - volatile bool stopRequest; + volatile bool betaCutoff; volatile int slaves[MAX_THREADS]; }; @@ -73,21 +77,19 @@ struct SplitPoint { enum ThreadState { + THREAD_INITIALIZING, // thread is initializing itself THREAD_SEARCHING, // thread is performing work - THREAD_AVAILABLE, // thread is polling for work - THREAD_SLEEPING, // we are not thinking, so thread is sleeping + THREAD_AVAILABLE, // thread is waiting for work THREAD_BOOKED, // other thread (master) has booked us as a slave THREAD_WORKISWAITING, // master has ordered us to start THREAD_TERMINATED // we are quitting and thread is terminated }; struct Thread { + volatile ThreadState state; SplitPoint* volatile splitPoint; volatile int activeSplitPoints; - uint64_t nodes; - uint64_t betaCutOffs[2]; - volatile ThreadState state; - unsigned char pad[64]; // set some distance among local data for each thread + SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS]; };