Use only one ConditionVariable to sync UI

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index b4958ea32e22417527357b2b734e90fb0bf4eae8..a715d44ee17b2e5844e4be101b246041e9bc9c7d 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -251,7 +251,7 @@ void MainThread::idle_loop() {
 
       while (!thinking && !exit)
       {
 
       while (!thinking && !exit)
       {

-          Threads.sleepCondition.notify_one(); // Wake up the UI thread if needed
+          sleepCondition.notify_one(); // Wake up the UI thread if needed

           sleepCondition.wait(lk);
       }
 
           sleepCondition.wait(lk);
       }
 


@@ -271,6 +271,15 @@ void MainThread::idle_loop() {
 }
 
 
 }
 
 

+// MainThread::join() waits for main thread to finish the search
+
+void MainThread::join() {
+
+  std::unique_lock<Mutex> lk(mutex);
+  sleepCondition.wait(lk, [&]{ return !thinking; });
+}
+
+

 // ThreadPool::init() is called at startup to create and launch requested threads,
 // that will go immediately to sleep. We cannot use a c'tor because Threads is a
 // static object and we need a fully initialized engine at this point due to
 // ThreadPool::init() is called at startup to create and launch requested threads,
 // that will go immediately to sleep. We cannot use a c'tor because Threads is a
 // static object and we need a fully initialized engine at this point due to


@@ -337,21 +346,12 @@ Thread* ThreadPool::available_slave(const SplitPoint* sp) const {
 }
 
 
 }
 
 

-// ThreadPool::wait_for_think_finished() waits for main thread to finish the search
-
-void ThreadPool::wait_for_think_finished() {
-
-  std::unique_lock<Mutex> lk(main()->mutex);
-  sleepCondition.wait(lk, [&]{ return !main()->thinking; });
-}
-
-

 // ThreadPool::start_thinking() wakes up the main thread sleeping in
 // MainThread::idle_loop() and starts a new search, then returns immediately.
 
 void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
                                 StateStackPtr& states) {
 // ThreadPool::start_thinking() wakes up the main thread sleeping in
 // MainThread::idle_loop() and starts a new search, then returns immediately.
 
 void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
                                 StateStackPtr& states) {

-  wait_for_think_finished();
+  main()->join();

 
   SearchTime = now(); // As early as possible
 
 
   SearchTime = now(); // As early as possible