X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=585f208813a2134c091e0b8de43fc45db5820bae;hp=602e1f3b37996ca65ba849cbef9bff8a41f4abb0;hb=5f222f1d98c9b4cb07aa2303f085c2064e7ea77a;hpb=108f0da4d7f993732aa2e854b8f3fa8ca6d3b46c diff --git a/src/thread.h b/src/thread.h index 602e1f3b..585f2088 100644 --- a/src/thread.h +++ b/src/thread.h @@ -1,8 +1,6 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file) Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +30,7 @@ #include "pawns.h" #include "position.h" #include "search.h" -#include "thread_win32.h" +#include "thread_win32_osx.h" /// Thread class keeps together all the thread-related stuff. We use @@ -42,11 +40,11 @@ class Thread { - Mutex mutex; - ConditionVariable cv; + std::mutex mutex; + std::condition_variable cv; size_t idx; bool exit = false, searching = true; // Set before starting std::thread - std::thread stdThread; + NativeThread stdThread; public: explicit Thread(size_t); @@ -59,19 +57,23 @@ public: Pawns::Table pawnsTable; Material::Table materialTable; - Endgames endgames; - size_t PVIdx, PVLast; - int selDepth, nmp_ply, nmp_odd; - std::atomic nodes, tbHits; + size_t pvIdx, pvLast; + uint64_t ttHitAverage; + int selDepth, nmpMinPly; + Color nmpColor; + std::atomic nodes, tbHits, bestMoveChanges; Position rootPos; + StateInfo rootState; Search::RootMoves rootMoves; Depth rootDepth, completedDepth; CounterMoveHistory counterMoves; ButterflyHistory mainHistory; + LowPlyHistory lowPlyHistory; CapturePieceToHistory captureHistory; - ContinuationHistory contHistory; + ContinuationHistory continuationHistory[2][2]; Score contempt; + int failedHighCnt; }; @@ -84,10 +86,12 @@ struct MainThread : public Thread { void search() override; void check_time(); - bool failedLow; - double bestMoveChanges, previousTimeReduction; - Value previousScore; + double previousTimeReduction; + Value bestPreviousScore; + Value iterValue[4]; int callsCnt; + bool stopOnPonderhit; + std::atomic_bool ponder; }; @@ -104,8 +108,11 @@ struct ThreadPool : public std::vector { 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); } + Thread* get_best_thread() const; + void start_searching(); + void wait_for_search_finished() const; - std::atomic_bool stop, ponder, stopOnPonderhit; + std::atomic_bool stop, increaseDepth; private: StateListPtr setupStates;