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

Rearrange check_time()

Browse source 
Remove an ugly workaround for a gcc
warning while there.

No functional change.
This commit is contained in:
Marco Costalba 2014-10-18 07:44:08 +02:00 • committed by Joona Kiiski
parent 0608d6aaec
commit d29a68f585
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/search.cpp
View file

@ -1541,7 +1541,7 @@ void Thread::idle_loop() {
void check_time() { void check_time() {
static Time::point lastInfoTime = Time::now(); static Time::point lastInfoTime = Time::now();
int64_t nodes = 0; // Workaround silly 'uninitialized' gcc warning Time::point elapsed = Time::now() - SearchTime;
if (Time::now() - lastInfoTime >= 1000) if (Time::now() - lastInfoTime >= 1000)
{ {
@ -1549,14 +1549,24 @@ void check_time() {
dbg_print(); dbg_print();
} }
if (Limits.ponder) if (Limits.use_time_management() && !Limits.ponder)
return; {
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& elapsed > TimeMgr.available_time() * 75 / 100;
if (Limits.nodes) if ( stillAtFirstMove
|| elapsed > TimeMgr.maximum_time() - 2 * TimerThread::Resolution)
Signals.stop = true;
}
else if (Limits.movetime && elapsed >= Limits.movetime)
Signals.stop = true;
else if (Limits.nodes)
{ {
Threads.mutex.lock(); Threads.mutex.lock();
nodes = RootPos.nodes_searched(); int nodes = RootPos.nodes_searched();
// Loop across all split points and sum accumulated SplitPoint nodes plus // Loop across all split points and sum accumulated SplitPoint nodes plus
// all the currently active positions nodes. // all the currently active positions nodes.
@ -1577,18 +1587,8 @@ void check_time() {
} }
Threads.mutex.unlock(); Threads.mutex.unlock();
}
Time::point elapsed = Time::now() - SearchTime; if (nodes >= Limits.nodes)
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& elapsed > TimeMgr.available_time() * 75 / 100;
bool noMoreTime = elapsed > TimeMgr.maximum_time() - 2 * TimerThread::Resolution
|| stillAtFirstMove;
if ( (Limits.use_time_management() && noMoreTime)
|| (Limits.movetime && elapsed >= Limits.movetime)
|| (Limits.nodes && nodes >= Limits.nodes))
Signals.stop = true; Signals.stop = true;
} }
}