X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=56d000f3f94438275a83c88eb06ad7c2582fd921;hb=8d6d0223bfe357001208147bede5029a857e5180;hp=fbd3b7f4af2e58509ae1530ab6ad6efe8bbbbb76;hpb=9a1d5f0f1d8a12a85b198688d4f1d636a146eb7a;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index fbd3b7f4..56d000f3 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
#define THREAD_H_INCLUDED
#include
@@ -68,6 +68,7 @@ struct SplitPoint {
Value beta;
int nodeType;
Move threatMove;
+ bool cutNode;
// Const pointers to shared data
MovePicker* movePicker;
@@ -85,25 +86,39 @@ struct SplitPoint {
};
+/// ThreadBase struct is the base of the hierarchy from where we derive all the
+/// specialized thread classes.
+
+struct ThreadBase {
+
+ ThreadBase() : exit(false) {}
+ virtual ~ThreadBase() {}
+ virtual void idle_loop() = 0;
+ void notify_one();
+ void wait_for(volatile const bool& b);
+
+ Mutex mutex;
+ ConditionVariable sleepCondition;
+ NativeHandle handle;
+ volatile bool exit;
+};
+
+
/// Thread struct keeps together all the thread related stuff like locks, state
/// and especially split points. We also use per-thread pawn and material hash
/// tables so that once we get a pointer to an entry its life time is unlimited
/// and we don't have to care about someone changing the entry under our feet.
-struct Thread {
+struct Thread : public ThreadBase {
Thread();
- virtual ~Thread();
-
virtual void idle_loop();
- void notify_one();
bool cutoff_occurred() const;
- bool is_available_to(Thread* master) const;
- void wait_for(volatile const bool& b);
+ bool is_available_to(const Thread* master) const;
template
- void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
- Depth depth, Move threatMove, int moveCount, MovePicker* movePicker, int nodeType);
+ void split(Position& pos, const Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
+ Depth depth, Move threatMove, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);
SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
Material::Table materialTable;
@@ -112,17 +127,13 @@ struct Thread {
Position* activePosition;
size_t idx;
int maxPly;
- Mutex mutex;
- ConditionVariable sleepCondition;
- NativeHandle handle;
SplitPoint* volatile activeSplitPoint;
volatile int splitPointsSize;
volatile bool searching;
- volatile bool exit;
};
-/// MainThread and TimerThread are sublassed from Thread to characterize the two
+/// MainThread and TimerThread are derived classes used to characterize the two
/// special threads: the main one and the recurring timer.
struct MainThread : public Thread {
@@ -131,7 +142,7 @@ struct MainThread : public Thread {
volatile bool thinking;
};
-struct TimerThread : public Thread {
+struct TimerThread : public ThreadBase {
TimerThread() : msec(0) {}
virtual void idle_loop();
int msec;
@@ -147,9 +158,9 @@ struct ThreadPool : public std::vector {
void init(); // No c'tor and d'tor, threads rely on globals that should
void exit(); // be initialized and valid during the whole thread lifetime.
- MainThread* main_thread() { return static_cast((*this)[0]); }
+ MainThread* main() { return static_cast((*this)[0]); }
void read_uci_options();
- Thread* available_slave(Thread* master) const;
+ Thread* available_slave(const Thread* master) const;
void wait_for_think_finished();
void start_thinking(const Position&, const Search::LimitsType&,
const std::vector&, Search::StateStackPtr&);
@@ -164,4 +175,4 @@ struct ThreadPool : public std::vector {
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED