1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00

Fix a race in pondering mode

Fixes an hang when playing with ponder ON. Perhaps there is still
a very small race but now it seems engine does not hang anymore.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-11-26 16:29:54 +01:00
parent c4517c013c
commit ffa75215cc
3 changed files with 17 additions and 13 deletions

View file

@ -367,9 +367,6 @@ void Search::think() {
// Save "search start" time and reset elapsed time to zero
elapsed_search_time(get_system_time());
// Reset global search signals
memset((void*)&Signals, 0, sizeof(Signals));
// Set output stream mode: normal or chess960. Castling notation is different
cout << set960(pos.is_chess960());
@ -651,6 +648,8 @@ namespace {
// Do we have time for the next iteration? Can we stop searching now?
if (!Signals.stop && !Signals.stopOnPonderhit && Limits.useTimeManagement())
{
bool stop = false; // Local variable instead of the volatile Signals.stop
// Take in account some extra time if the best move has changed
if (depth > 4 && depth < 50)
TimeMgr.pv_instability(bestMoveChanges[depth], bestMoveChanges[depth - 1]);
@ -658,11 +657,11 @@ namespace {
// Stop search if most of available time is already consumed. We probably don't
// have enough time to search the first move at the next iteration anyway.
if (elapsed_search_time() > (TimeMgr.available_time() * 62) / 100)
Signals.stop = true;
stop = true;
// Stop search early if one move seems to be much better than others
if ( depth >= 10
&& !Signals.stop
&& !stop
&& ( bestMoveNeverChanged
|| elapsed_search_time() > (TimeMgr.available_time() * 40) / 100))
{
@ -674,14 +673,17 @@ namespace {
(ss+1)->excludedMove = MOVE_NONE;
if (v < rBeta)
Signals.stop = true;
stop = true;
}
// If we are allowed to ponder do not stop the search now but keep pondering
if (Signals.stop && Limits.ponder) // FIXME Limits.ponder is racy
if (stop)
{
Signals.stop = false;
// If we are allowed to ponder do not stop the search now but
// keep pondering until GUI sends "ponderhit" or "stop".
if (Limits.ponder) // FIXME racing
Signals.stopOnPonderhit = true;
else
Signals.stop = true;
}
}
}

View file

@ -438,6 +438,9 @@ void ThreadsManager::start_thinking(bool asyncMode) {
while (!main.do_sleep)
cond_wait(&sleepCond, &main.sleepLock);
// Reset signals before to start the search
memset((void*)&Search::Signals, 0, sizeof(Search::Signals));
main.do_sleep = false;
cond_signal(&main.sleepCond); // Wake up main thread

View file

@ -82,11 +82,10 @@ void uci_loop() {
Search::Limits.ponder = false; // FIXME racing
if (Search::Signals.stopOnPonderhit)
{
Search::Signals.stop = true;
Threads[0].wake_up(); // In case is waiting for stop or ponderhit
}
}
else if (token == "go")
go(pos, is);