X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=609b2e609687a9e1cafb1952aef2d0c7dd96a4cc;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hp=d9a91f004a1ed7724e6b1e9913ac84b7559e6930;hpb=0363b5435847e66678cd3fa0d8a94e30b9a91663;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index d9a91f00..609b2e60 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,19 +27,9 @@
#include "position.h"
#include "search.h"
-
-////
-//// Constants and variables
-////
-
-const int MAX_THREADS = 8;
+const int MAX_THREADS = 16;
const int MAX_ACTIVE_SPLIT_POINTS = 8;
-
-////
-//// Types
-////
-
struct SplitPoint {
// Const data after splitPoint has been setup
@@ -55,41 +39,39 @@ struct SplitPoint {
bool pvNode, mateThreat;
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;
+ volatile int64_t nodes;
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
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 {
- uint64_t nodes;
volatile ThreadState state;
SplitPoint* volatile splitPoint;
volatile int activeSplitPoints;
SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
};
-
#endif // !defined(THREAD_H_INCLUDED)