Rename wake_up() to notify_one()

To align to C++ std::thread conventions.

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index 1371d1b9ee4085c70b89185520f48c5f525f7b9f..002f0500ac8e21ce3c52179d59f414239eb5d69f 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1696,7 +1696,7 @@ void Thread::idle_loop() {
               && !sp->slavesMask)
           {
               assert(!sp->master->is_searching);
               && !sp->slavesMask)
           {
               assert(!sp->master->is_searching);

-              sp->master->wake_up();
+              sp->master->notify_one();

           }
 
           // After releasing the lock we cannot access anymore any SplitPoint
           }
 
           // After releasing the lock we cannot access anymore any SplitPoint

diff --git a/src/thread.cpp b/src/thread.cpp
index 180869c6191d0d909d131fe2a8d5e1cc59f1c821..b11447dfc175f41180fc3d2a265c215ad79b8372 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -67,7 +67,7 @@ Thread::~Thread() {
   assert(do_sleep);
 
   do_exit = true; // Search must be already finished
   assert(do_sleep);
 
   do_exit = true; // Search must be already finished

-  wake_up();
+  notify_one();

   thread_join(handle); // Wait for thread termination
 }
 
   thread_join(handle); // Wait for thread termination
 }
 


@@ -120,10 +120,10 @@ void Thread::main_loop() {
 }
 
 
 }
 
 

-// Thread::wake_up() wakes up the thread, normally at the beginning of the search
-// or, if "sleeping threads" is used at split time.
+// Thread::notify_one() wakes up the thread, normally at the beginning of the
+// search or, if "sleeping threads" is used at split time.

 
 

-void Thread::wake_up() {
+void Thread::notify_one() {

 
   mutex.lock();
   sleepCondition.notify_one();
 
   mutex.lock();
   sleepCondition.notify_one();


@@ -242,7 +242,7 @@ void ThreadPool::wake_up() const {
       threads[i]->do_sleep = false;
 
       if (!useSleepingThreads)
       threads[i]->do_sleep = false;
 
       if (!useSleepingThreads)

-          threads[i]->wake_up();
+          threads[i]->notify_one();

   }
 }
 
   }
 }
 


@@ -271,6 +271,16 @@ bool ThreadPool::available_slave_exists(Thread* master) const {
 }
 
 
 }
 
 

+// set_timer() is used to set the timer to trigger after msec milliseconds.
+// If msec is 0 then timer is stopped.
+
+void ThreadPool::set_timer(int msec) {
+
+  timer->maxPly = msec;
+  timer->notify_one(); // Wake up and restart the timer
+}
+
+

 // split() does the actual work of distributing the work at a node between
 // several available threads. If it does not succeed in splitting the node
 // (because no idle threads are available, or because we have no unused split
 // split() does the actual work of distributing the work at a node between
 // several available threads. If it does not succeed in splitting the node
 // (because no idle threads are available, or because we have no unused split


@@ -336,7 +346,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
           threads[i]->is_searching = true; // Slave leaves idle_loop()
 
           if (useSleepingThreads)
           threads[i]->is_searching = true; // Slave leaves idle_loop()
 
           if (useSleepingThreads)

-              threads[i]->wake_up();
+              threads[i]->notify_one();

 
           if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
               break;
 
           if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
               break;


@@ -383,18 +393,6 @@ template Value ThreadPool::split<false>(Position&, Stack*, Value, Value, Value,
 template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
 
 
 template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
 
 

-// set_timer() is used to set the timer to trigger after msec milliseconds.
-// If msec is 0 then timer is stopped.
-
-void ThreadPool::set_timer(int msec) {
-
-  timer->mutex.lock();
-  timer->maxPly = msec;
-  timer->sleepCondition.notify_one(); // Wake up and restart the timer
-  timer->mutex.unlock();
-}
-
-

 // wait_for_search_finished() waits for main thread to go to sleep, this means
 // search is finished. Then returns.
 
 // wait_for_search_finished() waits for main thread to go to sleep, this means
 // search is finished. Then returns.
 


@@ -429,5 +427,5 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
           RootMoves.push_back(RootMove(ml.move()));
 
   main_thread()->do_sleep = false;
           RootMoves.push_back(RootMove(ml.move()));
 
   main_thread()->do_sleep = false;

-  main_thread()->wake_up();
+  main_thread()->notify_one();

 }
 }

diff --git a/src/thread.h b/src/thread.h
index 92be3a22985572303fae5c669386daf25a6919a8..ad8071edb41aed93b79768c5cdae62564129d3c5 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -99,7 +99,7 @@ public:
   Thread(Fn fn);
  ~Thread();
 
   Thread(Fn fn);
  ~Thread();
 

-  void wake_up();
+  void notify_one();

   bool cutoff_occurred() const;
   bool is_available_to(Thread* master) const;
   void idle_loop();
   bool cutoff_occurred() const;
   bool is_available_to(Thread* master) const;
   void idle_loop();

diff --git a/src/uci.cpp b/src/uci.cpp
index 33b4ef1ad6182ea1562f5ac154c7abc0d2e209e9..ad7a8d133f95eb9e897e1da3a6eea2e4d78d8acb 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -76,7 +76,7 @@ void UCI::loop(const string& args) {
           if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
           {
               Search::Signals.stop = true;
           if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
           {
               Search::Signals.stop = true;

-              Threads.main_thread()->wake_up(); // Could be sleeping
+              Threads.main_thread()->notify_one(); // Could be sleeping

           }
           else
               Search::Limits.ponder = false;
           }
           else
               Search::Limits.ponder = false;