From e18321f55a2f51a2bf1775200241381b63daf181 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 22 Oct 2016 08:21:38 +0200 Subject: [PATCH 1/1] Correcty resey TB hit counter Restore original behaviour to reset the counter before a new move search. Also fixed some warnings and added const qualifier to a couple of functions, as suggested by m_stembera. Thanks to Werner Bergmans for reporting the regression. No functional change. --- src/thread.cpp | 8 +++++--- src/thread.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/thread.cpp b/src/thread.cpp index 4d290d7c..1f1490a9 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -35,7 +35,8 @@ ThreadPool Threads; // Global object Thread::Thread() { resetCalls = exit = false; - maxPly = callsCnt = tbHits = 0; + maxPly = callsCnt = 0; + tbHits = 0; history.clear(); counterMoves.clear(); idx = Threads.size(); // Start from 0 @@ -158,7 +159,7 @@ void ThreadPool::read_uci_options() { /// ThreadPool::nodes_searched() returns the number of nodes searched -uint64_t ThreadPool::nodes_searched() { +uint64_t ThreadPool::nodes_searched() const { uint64_t nodes = 0; for (Thread* th : *this) @@ -169,7 +170,7 @@ uint64_t ThreadPool::nodes_searched() { /// ThreadPool::tb_hits() returns the number of TB hits -uint64_t ThreadPool::tb_hits() { +uint64_t ThreadPool::tb_hits() const { uint64_t hits = 0; for (Thread* th : *this) @@ -210,6 +211,7 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states, for (Thread* th : Threads) { th->maxPly = 0; + th->tbHits = 0; th->rootDepth = DEPTH_ZERO; th->rootMoves = rootMoves; th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th); diff --git a/src/thread.h b/src/thread.h index 408aaef7..d1165bb0 100644 --- a/src/thread.h +++ b/src/thread.h @@ -99,8 +99,8 @@ struct ThreadPool : public std::vector { MainThread* main() { return static_cast(at(0)); } void start_thinking(Position&, StateListPtr&, const Search::LimitsType&); void read_uci_options(); - uint64_t nodes_searched(); - uint64_t tb_hits(); + uint64_t nodes_searched() const; + uint64_t tb_hits() const; private: StateListPtr setupStates; -- 2.39.2