kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-12 03:59:15 +00:00
Code Issues Releases Wiki Activity

Retire SearchStartTime global

Browse source 
Use a static variable inside current_search_time() instead.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-04-22 11:57:22 +02:00
parent f349143a6b
commit 8bf9dc8254
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/search.cpp
View file

@ -233,7 +233,7 @@ namespace {
int MultiPV, UCIMultiPV; int MultiPV, UCIMultiPV;
// Time management variables // Time management variables
int SearchStartTime, MaxNodes, MaxDepth, ExactMaxTime; int MaxNodes, MaxDepth, ExactMaxTime;
bool UseTimeManagement, InfiniteSearch, Pondering, StopOnPonderhit; bool UseTimeManagement, InfiniteSearch, Pondering, StopOnPonderhit;
bool FirstRootMove, StopRequest, QuitRequest, AspirationFailLow; bool FirstRootMove, StopRequest, QuitRequest, AspirationFailLow;
TimeManager TimeMgr; TimeManager TimeMgr;
@ -291,7 +291,7 @@ namespace {
void update_gains(const Position& pos, Move move, Value before, Value after); void update_gains(const Position& pos, Move move, Value before, Value after);
void do_skill_level(Move* best, Move* ponder); void do_skill_level(Move* best, Move* ponder);
int current_search_time(); int current_search_time(int set = 0);
std::string value_to_uci(Value v); std::string value_to_uci(Value v);
std::string speed_to_uci(int64_t nodes); std::string speed_to_uci(int64_t nodes);
void poll(const Position& pos); void poll(const Position& pos);
@ -448,7 +448,7 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[
// Initialize global search-related variables // Initialize global search-related variables
StopOnPonderhit = StopRequest = QuitRequest = AspirationFailLow = SendSearchedNodes = false; StopOnPonderhit = StopRequest = QuitRequest = AspirationFailLow = SendSearchedNodes = false;
NodesSincePoll = 0; NodesSincePoll = 0;
SearchStartTime = get_system_time(); current_search_time(get_system_time());
ExactMaxTime = maxTime; ExactMaxTime = maxTime;
MaxDepth = maxDepth; MaxDepth = maxDepth;
MaxNodes = maxNodes; MaxNodes = maxNodes;
@ -1843,9 +1843,14 @@ split_point_start: // At split points actual search starts from here
// current_search_time() returns the number of milliseconds which have passed // current_search_time() returns the number of milliseconds which have passed
// since the beginning of the current search. // since the beginning of the current search.
int current_search_time() { int current_search_time(int set) {
return get_system_time() - SearchStartTime; static int searchStartTime;
if (set)
searchStartTime = set;
return get_system_time() - searchStartTime;
} }
@ -1861,9 +1866,9 @@ split_point_start: // At split points actual search starts from here
std::stringstream s; std::stringstream s;
if (abs(v) < VALUE_MATE - PLY_MAX * ONE_PLY) if (abs(v) < VALUE_MATE - PLY_MAX * ONE_PLY)
s << "cp " << int(v) * 100 / int(PawnValueMidgame); // Scale to centipawns s << "cp " << int(v) * 100 / int(PawnValueMidgame); // Scale to centipawns
else else
s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
return s.str(); return s.str();
} }
@ -2033,7 +2038,7 @@ split_point_start: // At split points actual search starts from here
assert(threadID >= 0 && threadID < MAX_THREADS); assert(threadID >= 0 && threadID < MAX_THREADS);
int i; int i;
bool allFinished = false; bool allFinished;
while (true) while (true)
{ {
@ -2058,7 +2063,7 @@ split_point_start: // At split points actual search starts from here
if (threads[threadID].state == THREAD_INITIALIZING) if (threads[threadID].state == THREAD_INITIALIZING)
threads[threadID].state = THREAD_AVAILABLE; threads[threadID].state = THREAD_AVAILABLE;
// Grab the lock to avoid races with wake_sleeping_thread() // Grab the lock to avoid races with Thread::wake_up()
lock_grab(&threads[threadID].sleepLock); lock_grab(&threads[threadID].sleepLock);
// If we are master and all slaves have finished do not go to sleep // If we are master and all slaves have finished do not go to sleep