Wait for main thread to finish before to exit

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index 18e35fb062ca9e11919cd6bab60148d2c13a3e7a..fef2e9c9185466918f5443d9d416d64714996ab0 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -112,11 +112,11 @@ bool Thread::is_available_to(int master) const {
 
 void ThreadsManager::read_uci_options() {
 
-  maxThreadsPerSplitPoint = Options["Max Threads per Split Point"].value<int>();
-  minimumSplitDepth       = Options["Min Split Depth"].value<int>() * ONE_PLY;
-  useSleepingThreads      = Options["Use Sleeping Threads"].value<bool>();
+  maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
+  minimumSplitDepth       = Options["Min Split Depth"] * ONE_PLY;
+  useSleepingThreads      = Options["Use Sleeping Threads"];
 
-  set_size(Options["Threads"].value<int>());
+  set_size(Options["Threads"]);
 }
 
 
@@ -197,7 +197,7 @@ void ThreadsManager::exit() {
 
   for (int i = 0; i <= MAX_THREADS; i++)
   {
-      threads[i].do_terminate = true;
+      threads[i].do_terminate = true; // Search must be already finished
       threads[i].wake_up();
 
       // Wait for thread termination
@@ -458,6 +458,27 @@ void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limit
 }
 
 
+// ThreadsManager::stop_thinking() is used by UI thread to raise a stop request
+// and to wait for the main thread finishing the search. Needed to wait exiting
+// and terminate the threads after a 'quit' command.
+
+void ThreadsManager::stop_thinking() {
+
+  Thread& main = threads[0];
+
+  Search::Signals.stop = true;
+
+  lock_grab(&main.sleepLock);
+
+  cond_signal(&main.sleepCond); // In case is waiting for stop or ponderhit
+
+  while (!main.do_sleep)
+      cond_wait(&sleepCond, &main.sleepLock);
+
+  lock_release(&main.sleepLock);
+}
+
+
 // ThreadsManager::wait_for_stop_or_ponderhit() is called when the maximum depth
 // is reached while the program is pondering. The point is to work around a wrinkle
 // in the UCI protocol: When pondering, the engine is not allowed to give a