X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fthread.h;h=4e63fe478073953fcffd7f474e728c8f659afd43;hb=716a145a6cc9257c3b45a41030913220c3878249;hp=8115bc71decd66b917ef78d82ada490685fc4dc2;hpb=e5bc79fb9cf0f47c850ad0cc0b057d9f86e788cd;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 8115bc71..4e63fe47 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-2016 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,14 @@
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
#include "material.h"
@@ -27,141 +33,75 @@
#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 struct keeps together all the thread-related stuff. 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.
- 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;
- Thread* masterThread;
- Depth depth;
- Value beta;
- int nodeType;
- Move threatMove;
-
- // Const pointers to shared data
- MovePicker* movePicker;
- SplitPoint* parentSplitPoint;
-
- // Shared data
+ std::thread nativeThread;
Mutex mutex;
- 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 sleepCondition;
+ bool exit, searching;
+public:
Thread();
virtual ~Thread();
+ virtual void search();
+ void idle_loop();
+ void start_searching(bool resume = false);
+ void wait_for_search_finished();
+ void wait(std::atomic_bool& b);
- 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);
-
- 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);
-
- 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;
+ size_t idx, PVIdx;
+ int maxPly, callsCnt;
+
+ Position rootPos;
+ Search::RootMoves rootMoves;
+ Depth rootDepth;
+ HistoryStats history;
+ MoveStats counterMoves;
+ Depth completedDepth;
+ std::atomic_bool resetCalls;
};
-/// MainThread and TimerThread are sublassed from Thread to characterize the two
-/// special threads: the main one and the recurring timer.
+/// MainThread is a derived class with a specific overload for the main thread
struct MainThread : public Thread {
- MainThread() : thinking(true) {} // Avoid a race with start_thinking()
- virtual void idle_loop();
- volatile bool thinking;
-};
+ virtual void search();
-struct TimerThread : public Thread {
- TimerThread() : msec(0) {}
- virtual void idle_loop();
- int msec;
+ bool easyMovePlayed, failedLow;
+ double bestMoveChanges;
+ Value previousScore;
};
-/// ThreadPool struct 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.
+/// ThreadPool struct handles all the threads-related stuff like init, starting,
+/// parking and, most importantly, launching a thread. All the access to threads
+/// data is done through this class.
struct ThreadPool : public std::vector {
- void init(); // No c'tor and d'tor, threads rely on globals that should
+ void init(); // No constructor and destructor, 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(at(0)); }
+ void start_thinking(Position&, StateListPtr&, const Search::LimitsType&);
void read_uci_options();
- Thread* available_slave(Thread* master) const;
- void wait_for_think_finished();
- void start_thinking(const Position&, const Search::LimitsType&,
- const std::vector&, Search::StateStackPtr&);
-
- bool sleepWhileIdle;
- Depth minimumSplitDepth;
- size_t maxThreadsPerSplitPoint;
- Mutex mutex;
- ConditionVariable sleepCondition;
- TimerThread* timer;
+ int64_t nodes_searched();
+
+private:
+ StateListPtr setupStates;
};
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED