X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread.h;h=b476d529f4d3a1455e662958a8190a6094178870;hb=bbfe452f85929a938bda7fce9894f57659987919;hp=87b78136f5c7851b992327cdc03d65205c7becc2;hpb=a4a0ffce711962c0b04b35998c3c06491be373bf;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 87b78136..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,18 +27,8 @@
#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 = 32;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
struct SplitPoint {
@@ -52,44 +36,51 @@ struct SplitPoint {
SplitPoint* parent;
const Position* pos;
Depth depth;
- bool pvNode, mateThreat;
+ bool pvNode;
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];
+ int maxPly;
+ Lock sleepLock;
+ WaitCondition sleepCond;
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];
+ void wake_up() {
+ lock_grab(&sleepLock);
+ cond_signal(&sleepCond);
+ lock_release(&sleepLock);
+ }
+};
#endif // !defined(THREAD_H_INCLUDED)