X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=609b2e609687a9e1cafb1952aef2d0c7dd96a4cc;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hp=869778401585bac199b98a1a39f28d82ca218d10;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 86977840..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,64 +27,51 @@
#include "position.h"
#include "search.h"
-
-////
-//// Constants and variables
-////
-
-const int MAX_THREADS = 8;
-const int ACTIVE_SPLIT_POINTS_MAX = 8;
-
-
-////
-//// Types
-////
+const int MAX_THREADS = 16;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
struct SplitPoint {
// Const data after splitPoint has been setup
SplitPoint* parent;
const Position* pos;
- bool pvNode;
Depth depth;
- bool mateThreat;
+ bool pvNode, mateThreat;
Value beta;
- int ply, master, slaves[MAX_THREADS];
- SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];
+ int ply;
+ int master;
+ Move threatMove;
// 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 moves;
- volatile int cpus;
- volatile bool stopRequest;
+ volatile int moveCount;
+ 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 {
- SplitPoint* 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* volatile splitPoint;
+ volatile int activeSplitPoints;
+ SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
};
-
#endif // !defined(THREAD_H_INCLUDED)