X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fthread.h;h=3f902dc17b794a35250f87759e932dd9f0607bd4;hb=21120288a385cb2eabb9d32f6dc6007a03adf382;hp=5f8ad28e2be4c7f04676a7ba315213145ab88e02;hpb=62b32a47378fa84108bb8aee2192ba66c87c3280;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 5f8ad28e..3f902dc1 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,9 +17,13 @@
along with this program. If not, see .
*/
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
#define THREAD_H_INCLUDED
+#include
+#include
+#include
+#include
#include
#include "material.h"
@@ -28,56 +32,34 @@
#include "position.h"
#include "search.h"
-const int MAX_THREADS = 64; // Because SplitPoint::slavesMask is a uint64_t
-const int MAX_SPLITPOINTS_PER_THREAD = 8;
-
-struct Mutex {
- Mutex() { lock_init(l); }
- ~Mutex() { lock_destroy(l); }
-
- void lock() { lock_grab(l); }
- void unlock() { lock_release(l); }
-
-private:
- friend struct ConditionVariable;
-
- Lock l;
-};
-
-struct ConditionVariable {
- ConditionVariable() { cond_init(c); }
- ~ConditionVariable() { cond_destroy(c); }
-
- void wait(Mutex& m) { cond_wait(c, m.l); }
- void wait_for(Mutex& m, int ms) { timed_wait(c, m.l, ms); }
- void notify_one() { cond_signal(c); }
+struct Thread;
-private:
- WaitCondition c;
-};
+const int MAX_THREADS = 128;
+const int MAX_SPLITPOINTS_PER_THREAD = 8;
-struct Thread;
+/// SplitPoint struct stores information shared by the threads searching in
+/// parallel below the same split point. It is populated at splitting time.
struct SplitPoint {
// Const data after split point has been setup
const Position* pos;
- const Search::Stack* ss;
- Thread* master;
+ Search::Stack* ss;
+ Thread* masterThread;
Depth depth;
Value beta;
int nodeType;
- Move threatMove;
+ bool cutNode;
// Const pointers to shared data
- MovePicker* mp;
- SplitPoint* parent;
-
- // Shared data
- Mutex mutex;
- Position* slavesPositions[MAX_THREADS];
- volatile uint64_t slavesMask;
- volatile int64_t nodes;
+ MovePicker* movePicker;
+ SplitPoint* parentSplitPoint;
+
+ // Shared variable data
+ std::mutex mutex;
+ std::bitset slavesMask;
+ volatile bool allSlavesSearching;
+ volatile uint64_t nodes;
volatile Value alpha;
volatile Value bestValue;
volatile Move bestMove;
@@ -86,90 +68,90 @@ struct SplitPoint {
};
+/// ThreadBase struct is the base of the hierarchy from where we derive all the
+/// specialized thread classes.
+
+struct ThreadBase {
+
+ virtual ~ThreadBase() = default;
+ virtual void idle_loop() = 0;
+ void notify_one();
+ void wait_for(volatile const bool& b);
+
+ std::thread nativeThread;
+ std::mutex mutex;
+ std::condition_variable sleepCondition;
+ volatile bool exit = false;
+};
+
+
/// 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 available_to(const Thread* master) const;
+
+ void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
+ Depth depth, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);
SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
+ Pawns::Table pawnsTable;
Material::Table materialTable;
Endgames endgames;
- Pawns::Table pawnsTable;
+ 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 {
- MainThread() : thinking(true) {} // Avoid a race with start_thinking()
virtual void idle_loop();
- volatile bool thinking;
+ volatile bool thinking = true; // Avoid a race with start_thinking()
};
-struct TimerThread : public Thread {
- TimerThread() : msec(0) {}
+struct TimerThread : public ThreadBase {
+
+ static const int Resolution = 5; // Millisec between two check_time() calls
+
virtual void idle_loop();
- int msec;
+
+ bool run = false;
};
-/// ThreadPool class handles all the threads related stuff like init, starting,
-/// parking and, the most important, launching a slave thread at a split point.
+/// ThreadPool struct handles all the threads related stuff like init, starting,
+/// parking and, most importantly, launching a slave thread at a split point.
/// All the access to shared thread data is done through this class.
-class ThreadPool {
-
-public:
- 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.
+struct ThreadPool : public std::vector {
- Thread& operator[](size_t id) { return *threads[id]; }
- size_t size() const { return threads.size(); }
- MainThread* main_thread() { return static_cast(threads[0]); }
- TimerThread* timer_thread() { return timer; }
+ void init(); // No c'tor and d'tor, threads rely on globals that should be
+ void exit(); // initialized and are valid during the whole thread lifetime.
+ MainThread* main() { return static_cast(at(0)); }
void read_uci_options();
- bool slave_available(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&);
+ void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
- template
- Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
- Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
-
- bool sleepWhileIdle;
Depth minimumSplitDepth;
- Mutex mutex;
- ConditionVariable sleepCondition;
-
-private:
- std::vector threads;
+ std::mutex mutex;
+ std::condition_variable sleepCondition;
TimerThread* timer;
- int maxThreadsPerSplitPoint;
};
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED