X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread.h;h=b476d529f4d3a1455e662958a8190a6094178870;hb=bbfe452f85929a938bda7fce9894f57659987919;hp=fd4f42cfeb317d7339f2101c90d63972ad5f0669;hpb=b29198354c416b5966308c96f649b9b47f9c1832;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index fd4f42cf..b476d529 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -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,51 +27,60 @@
#include "position.h"
#include "search.h"
-
-////
-//// Constants and variables
-////
-
-const int THREAD_MAX = 8;
-const int ACTIVE_SPLIT_POINTS_MAX = 8;
-
-
-////
-//// Types
-////
+const int MAX_THREADS = 32;
+const int MAX_ACTIVE_SPLIT_POINTS = 8;
struct SplitPoint {
- SplitPoint *parent;
+
+ // Const data after splitPoint has been setup
+ SplitPoint* parent;
const Position* pos;
- SearchStack sstack[THREAD_MAX][PLY_MAX_PLUS_2];
- SearchStack *parentSstack;
- int ply;
Depth depth;
- volatile Value alpha, beta, bestValue;
- Value futilityValue;
bool pvNode;
- int master, slaves[THREAD_MAX];
+ Value beta;
+ int ply;
+ int master;
+ Move threatMove;
+
+ // Const pointers to shared data
+ MovePicker* mp;
+ SearchStack* ss;
+
+ // Shared data
Lock lock;
- MovePicker *mp;
- volatile int moves;
- volatile int cpus;
- bool finished;
+ volatile int64_t nodes;
+ volatile Value alpha;
+ volatile Value bestValue;
+ 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 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;
+ int maxPly;
+ Lock sleepLock;
+ WaitCondition sleepCond;
+ volatile ThreadState state;
+ SplitPoint* volatile splitPoint;
volatile int activeSplitPoints;
- uint64_t nodes;
- uint64_t betaCutOffs[2];
- volatile bool stopRequest;
- volatile bool running;
- volatile bool idle;
- volatile bool sleeping;
- volatile bool workIsWaiting;
- volatile bool printCurrentLineRequest;
- unsigned char pad[64]; // set some distance among local data for each thread
-};
+ SplitPoint splitPoints[MAX_ACTIVE_SPLIT_POINTS];
+ void wake_up() {
+ lock_grab(&sleepLock);
+ cond_signal(&sleepCond);
+ lock_release(&sleepLock);
+ }
+};
#endif // !defined(THREAD_H_INCLUDED)