X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=1397449733d8f7eebbc303ce879ff1dc7954b7ff;hb=52f92d05a9eae0cc68a3cd157f8df35802a98297;hp=793a3c606797c573131fe5f59cbc4e6c915c4b6e;hpb=588670e8d2ed5735300c5549ef754ceb09f1f461;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 793a3c60..13974497 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,8 @@
/*
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
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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 +18,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"
@@ -27,153 +32,92 @@
#include "pawns.h"
#include "position.h"
#include "search.h"
+#include "thread_win32.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); }
+/// Thread class keeps together all the thread-related stuff. We 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.
- void lock() { lock_grab(l); }
- void unlock() { lock_release(l); }
+class Thread {
-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); }
-
-private:
- WaitCondition c;
-};
-
-struct Thread;
-
-struct SplitPoint {
-
- // Const data after split point has been setup
- const Position* pos;
- const Search::Stack* ss;
- Depth depth;
- Value beta;
- int nodeType;
- Thread* master;
- Move threatMove;
-
- // Const pointers to shared data
- MovePicker* mp;
- SplitPoint* parent;
-
- // Shared data
Mutex mutex;
- Position* activePositions[MAX_THREADS];
- volatile uint64_t slavesMask;
- volatile int64_t nodes;
- volatile Value alpha;
- volatile Value bestValue;
- volatile Move bestMove;
- volatile int moveCount;
- volatile bool cutoff;
-};
-
-
-/// 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 {
+ ConditionVariable cv;
+ size_t idx;
+ bool exit = false, searching = true; // Set before starting std::thread
+ std::thread stdThread;
- Thread();
+public:
+ explicit Thread(size_t);
virtual ~Thread();
+ virtual void search();
+ void clear();
+ void idle_loop();
+ void start_searching();
+ void wait_for_search_finished();
- 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);
-
- SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
+ Pawns::Table pawnsTable;
Material::Table materialTable;
Endgames endgames;
- Pawns::Table pawnsTable;
- size_t idx;
- int maxPly;
- Mutex mutex;
- ConditionVariable sleepCondition;
- NativeHandle handle;
- SplitPoint* volatile curSplitPoint;
- volatile int splitPointsCnt;
- volatile bool searching;
- volatile bool exit;
+ size_t PVIdx;
+ int selDepth, nmp_ply, nmp_odd;
+ std::atomic nodes, tbHits;
+
+ Position rootPos;
+ Search::RootMoves rootMoves;
+ Depth rootDepth, completedDepth;
+ CounterMoveHistory counterMoves;
+ ButterflyHistory mainHistory;
+ CapturePieceToHistory captureHistory;
+ ContinuationHistory contHistory;
};
-/// MainThread and TimerThread are sublassed from Thread to charaterize the two
-/// special threads: the main one and the recurring timer.
+/// MainThread is a derived class specific for main thread
struct MainThread : public Thread {
- MainThread() : thinking(true) {} // Avoid a race with start_thinking()
- virtual void idle_loop();
- volatile bool thinking;
-};
-struct TimerThread : public Thread {
- TimerThread() : msec(0) {}
- virtual void idle_loop();
- int msec;
-};
+ using Thread::Thread;
+ void search() override;
+ void check_time();
-/// ThreadPool class handles all the threads related stuff like init, starting,
-/// parking and, the most important, launching a slave thread at a split point.
-/// All the access to shared thread data is done through this class.
+ bool failedLow;
+ double bestMoveChanges, previousTimeReduction;
+ Value previousScore;
+ int callsCnt;
+};
-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.
+/// ThreadPool struct handles all the threads-related stuff like init, starting,
+/// parking and, most importantly, launching a thread. All the access to threads
+/// is done through this class.
- 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; }
+struct ThreadPool : public std::vector {
- void read_uci_options();
- bool available_slave_exists(Thread* master) const;
- void wait_for_think_finished();
- void start_thinking(const Position&, const Search::LimitsType&,
- const std::vector&, Search::StateStackPtr&);
+ void start_thinking(Position&, StateListPtr&, const Search::LimitsType&, bool = false);
+ void clear();
+ void set(size_t);
- 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);
+ MainThread* main() const { return static_cast(front()); }
+ uint64_t nodes_searched() const { return accumulate(&Thread::nodes); }
+ uint64_t tb_hits() const { return accumulate(&Thread::tbHits); }
- bool sleepWhileIdle;
- Depth minimumSplitDepth;
+ std::atomic_bool stop, ponder, stopOnPonderhit;
private:
- friend struct Thread;
- friend struct MainThread;
- friend void check_time();
+ StateListPtr setupStates;
- std::vector threads;
- TimerThread* timer;
- Mutex mutex;
- ConditionVariable sleepCondition;
- int maxThreadsPerSplitPoint;
+ uint64_t accumulate(std::atomic Thread::* member) const {
+
+ uint64_t sum = 0;
+ for (Thread* th : *this)
+ sum += (th->*member).load(std::memory_order_relaxed);
+ return sum;
+ }
};
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED