Simplify nosleep logic

Avoid redundant 'while' conditions. It is enough to
check them in the outer loop.

Quick tested for no regression 10K games at 4 threads
ELO: -1.32 +-3.9 (95%) LOS: 25.6%
Total: 10000 W: 1653 L: 1691 D: 6656

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index b08b687af2408f55d3690645963ae899db907fdd..6ea5e3a261ffe1c6453dab650c4ab836417199b9 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -278,10 +278,13 @@ void Search::think() {
       }
 
       for (Thread* th : Threads)
       }
 
       for (Thread* th : Threads)

+      {

           th->maxPly = 0;
           th->maxPly = 0;

+          th->notify_one(); // Wake up all the threads
+      }

 
       Threads.timer->run = true;
 
       Threads.timer->run = true;

-      Threads.timer->notify_one(); // Wake up the recurring timer
+      Threads.timer->notify_one(); // Start the recurring timer

 
       id_loop(RootPos); // Let's start searching !
 
 
       id_loop(RootPos); // Let's start searching !
 


@@ -1591,25 +1594,8 @@ void Thread::idle_loop() {
 
   assert(!this_sp || (this_sp->master == this && searching));
 
 
   assert(!this_sp || (this_sp->master == this && searching));
 

-  while (   !exit
-         && !(this_sp && this_sp->slavesMask.none()))
+  while (!exit && !(this_sp && this_sp->slavesMask.none()))

   {
   {

-      // If there is nothing to do, sleep.
-      while(   !exit
-            && !(this_sp && this_sp->slavesMask.none())
-            && !searching)
-      {
-          if (   !this_sp
-              && !Threads.main()->thinking)
-          {
-              std::unique_lock<Mutex> lk(mutex);
-              while (!exit && !Threads.main()->thinking)
-                    sleepCondition.wait(lk);
-          }
-          else
-              std::this_thread::yield();
-      }
-

       // If this thread has been assigned work, launch a search
       while (searching)
       {
       // If this thread has been assigned work, launch a search
       while (searching)
       {


@@ -1715,6 +1701,18 @@ void Thread::idle_loop() {
               sp->spinlock.release();
           }
       }
               sp->spinlock.release();
           }
       }

+
+      // If search is finished then sleep, otherwise just yield
+      if (!Threads.main()->thinking)
+      {
+          assert(!this_sp);
+
+          std::unique_lock<Mutex> lk(mutex);
+          while (!exit && !Threads.main()->thinking)
+              sleepCondition.wait(lk);
+      }
+      else
+          std::this_thread::yield(); // Wait for a new job or for our slaves to finish

   }
 }
 
   }
 }
 

diff --git a/src/thread.cpp b/src/thread.cpp
index 4b5d845bd83577992601f1306a881bdacb812d19..b4958ea32e22417527357b2b734e90fb0bf4eae8 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -373,7 +373,5 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
           RootMoves.push_back(RootMove(m));
 
   main()->thinking = true;
           RootMoves.push_back(RootMove(m));
 
   main()->thinking = true;

-
-  for (Thread* th : *this)
-      th->notify_one();
+  main()->notify_one(); // Wake up main thread: 'thinking' must be already set

 }
 }