mirror of
https://github.com/sockspls/badfish
synced 2025-04-29 16:23:09 +00:00
After a "stop" do not read new input until search finishes
Unfortunatly xboard sends immediately the new position to search after sending "stop" when we have a ponder miss. Becuase main thread position is not copied but is referenced directly from root position and the latter is modified by the "position.." UCI command we end up with the working position that changes under our feet while the search is still recovering after the "stop" and this causes a crash. This happens only with the (broken) xboard, native UCI does not have this problem. Reported by otello1984 No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
ffa75215cc
commit
6809b57cfc
3 changed files with 22 additions and 4 deletions
|
@ -423,6 +423,23 @@ void Thread::main_loop() {
|
|||
}
|
||||
|
||||
|
||||
// ThreadsManager::wait_end_of_search() blocks UI thread until main thread has
|
||||
// returned to sleep in main_loop(). It is needed becuase xboard sends immediately
|
||||
// new position to search after a "stop" due to ponder miss.
|
||||
|
||||
void ThreadsManager::wait_end_of_search() {
|
||||
|
||||
Thread& main = threads[0];
|
||||
|
||||
lock_grab(&main.sleepLock);
|
||||
|
||||
while (!main.do_sleep)
|
||||
cond_wait(&sleepCond, &main.sleepLock);
|
||||
|
||||
lock_release(&main.sleepLock);
|
||||
}
|
||||
|
||||
|
||||
// ThreadsManager::start_thinking() is used by UI thread to wake up the main
|
||||
// thread parked in main_loop() and starting a new search. If asyncMode is true
|
||||
// then function returns immediately, otherwise caller is blocked waiting for
|
||||
|
@ -432,11 +449,10 @@ void ThreadsManager::start_thinking(bool asyncMode) {
|
|||
|
||||
Thread& main = threads[0];
|
||||
|
||||
lock_grab(&main.sleepLock);
|
||||
|
||||
// Wait main thread has finished before to launch a new search
|
||||
while (!main.do_sleep)
|
||||
cond_wait(&sleepCond, &main.sleepLock);
|
||||
wait_end_of_search();
|
||||
|
||||
lock_grab(&main.sleepLock);
|
||||
|
||||
// Reset signals before to start the search
|
||||
memset((void*)&Search::Signals, 0, sizeof(Search::Signals));
|
||||
|
|
|
@ -120,6 +120,7 @@ public:
|
|||
void start_thinking(bool asyncMode = true);
|
||||
void set_timer(int msec);
|
||||
void wait_for_stop_or_ponderhit();
|
||||
void wait_end_of_search();
|
||||
|
||||
template <bool Fake>
|
||||
Value split(Position& pos, SearchStack* ss, Value alpha, Value beta, Value bestValue,
|
||||
|
|
|
@ -72,6 +72,7 @@ void uci_loop() {
|
|||
quit = (token == "quit");
|
||||
Search::Signals.stop = true;
|
||||
Threads[0].wake_up(); // In case is waiting for stop or ponderhit
|
||||
Threads.wait_end_of_search(); // Block here until search finishes
|
||||
}
|
||||
|
||||
else if (cmd == "ponderhit")
|
||||
|
|
Loading…
Add table
Reference in a new issue