X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=b476d529f4d3a1455e662958a8190a6094178870;hp=ddcea17dd0963c7f0fb70bd12f9c8c60f2a0f8ad;hb=fe213d30faba4064a5d9c522f2310fc117f6e1d4;hpb=dedc6d758837a9ac141832fb69c2258b4711ea56 diff --git a/src/thread.h b/src/thread.h index ddcea17d..b476d529 100644 --- a/src/thread.h +++ b/src/thread.h @@ -17,15 +17,9 @@ along with this program. If not, see . */ - #if !defined(THREAD_H_INCLUDED) #define THREAD_H_INCLUDED - -//// -//// Includes -//// - #include #include "lock.h" @@ -33,35 +27,24 @@ #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; @@ -69,12 +52,11 @@ struct SplitPoint { volatile Value alpha; volatile Value bestValue; volatile int moveCount; - volatile bool stopRequest; + volatile bool betaCutoff; volatile int slaves[MAX_THREADS]; }; // ThreadState type is used to represent thread's current state - enum ThreadState { THREAD_INITIALIZING, // thread is initializing itself @@ -86,11 +68,19 @@ enum ThreadState }; struct Thread { + 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); + } +}; #endif // !defined(THREAD_H_INCLUDED)