X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread.h;h=afae57c3a9b02e7b265584e1cc56e65cc82704f1;hb=dcd8ce70941e9b8d5180eb43865bb9819e424c19;hp=64a56ccb7ab62b75773d9f8a002e6d3a2806cb40;hpb=231f62baf7b6d9cee18bf7e85bed0fc9b78eed73;p=stockfish
diff --git a/src/thread.h b/src/thread.h
index 64a56ccb..afae57c3 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,157 +18,87 @@
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 "evaluate.h"
#include "material.h"
#include "movepick.h"
#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); }
-
- 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); }
-
-private:
- WaitCondition c;
-};
-
-class 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.
+/// 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.
class Thread {
- typedef void (Thread::* Fn) (); // Pointer to member function
+ std::thread nativeThread;
+ Mutex mutex;
+ ConditionVariable sleepCondition;
+ bool exit, searching;
public:
- Thread(Fn fn);
- ~Thread();
-
- void wake_up();
- bool cutoff_occurred() const;
- bool is_available_to(Thread* master) const;
+ Thread();
+ virtual ~Thread();
+ virtual void search();
void idle_loop();
- void main_loop();
- void timer_loop();
- void wait_for_stop_or_ponderhit();
+ void start_searching(bool resume = false);
+ void wait_for_search_finished();
+ void wait(std::atomic_bool& b);
- SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
- Eval::Table evalTable;
+ Pawns::Table pawnsTable;
Material::Table materialTable;
Endgames endgames;
- PawnTable pawnTable;
- size_t idx;
- int maxPly;
- Mutex mutex;
- ConditionVariable sleepCondition;
- NativeHandle handle;
- Fn start_fn;
- SplitPoint* volatile curSplitPoint;
- volatile int splitPointsCnt;
- volatile bool is_searching;
- volatile bool do_sleep;
- volatile bool do_exit;
+ size_t idx, PVIdx;
+ int maxPly, callsCnt;
+
+ Position rootPos;
+ Search::RootMoveVector rootMoves;
+ Depth rootDepth;
+ HistoryStats history;
+ MovesStats counterMoves;
+ Depth completedDepth;
+ std::atomic_bool resetCalls;
};
-/// 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.
+/// MainThread is a derived class with a specific overload for the main thread
-class ThreadPool {
+struct MainThread : public Thread {
+ virtual void search();
-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.
+ bool easyMovePlayed, failedLow;
+ double bestMoveChanges;
+ Value previousMoveScore;
+};
+
+
+/// 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 {
- Thread& operator[](size_t id) { return *threads[id]; }
- bool use_sleeping_threads() const { return useSleepingThreads; }
- int min_split_depth() const { return minimumSplitDepth; }
- size_t size() const { return threads.size(); }
- Thread* main_thread() { return threads[0]; }
+ void init(); // No constructor and destructor, threads rely on globals that should
+ void exit(); // be initialized and valid during the whole thread lifetime.
- void wake_up() const;
- void sleep() const;
+ MainThread* main() { return static_cast(at(0)); }
+ void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
void read_uci_options();
- bool available_slave_exists(Thread* master) const;
- void set_timer(int msec);
- void wait_for_search_finished();
- void start_searching(const Position&, const Search::LimitsType&,
- const std::vector&, 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);
-private:
- friend class Thread;
- friend void check_time();
-
- std::vector threads;
- Thread* timer;
- Mutex mutex;
- ConditionVariable sleepCondition;
- Depth minimumSplitDepth;
- int maxThreadsPerSplitPoint;
- bool useSleepingThreads;
+ int64_t nodes_searched();
};
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED