Big renaming in thread stuff

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index 9bd7498979761942ba0b0e01f315e2c444385c26..1336ce077cdeac25abb6fc2811221db3aee1dc38 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -44,7 +44,7 @@ namespace { extern "C" {
 
 Thread::Thread() : splitPoints() {
 
 
 Thread::Thread() : splitPoints() {
 

-  is_searching = do_exit = false;
+  searching = exit = false;

   maxPly = splitPointsCnt = 0;
   curSplitPoint = NULL;
   idx = Threads.size();
   maxPly = splitPointsCnt = 0;
   curSplitPoint = NULL;
   idx = Threads.size();


@@ -61,7 +61,7 @@ Thread::Thread() : splitPoints() {
 
 Thread::~Thread() {
 
 
 Thread::~Thread() {
 

-  do_exit = true; // Search must be already finished
+  exit = true; // Search must be already finished

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


@@ -73,11 +73,11 @@ extern void check_time();
 
 void TimerThread::idle_loop() {
 
 
 void TimerThread::idle_loop() {
 

-  while (!do_exit)
+  while (!exit)

   {
       mutex.lock();
 
   {
       mutex.lock();
 

-      if (!do_exit)
+      if (!exit)

           sleepCondition.wait_for(mutex, msec ? msec : INT_MAX);
 
       mutex.unlock();
           sleepCondition.wait_for(mutex, msec ? msec : INT_MAX);
 
       mutex.unlock();


@@ -97,10 +97,9 @@ void MainThread::idle_loop() {
   {
       mutex.lock();
 
   {
       mutex.lock();
 

-      is_finished = true; // Always return to sleep after a search
-      is_searching = false;
+      thinking = false;

 
 

-      while (is_finished && !do_exit)
+      while (!thinking && !exit)

       {
           Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
           sleepCondition.wait(mutex);
       {
           Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
           sleepCondition.wait(mutex);


@@ -108,19 +107,21 @@ void MainThread::idle_loop() {
 
       mutex.unlock();
 
 
       mutex.unlock();
 

-      if (do_exit)
+      if (exit)

           return;
 
           return;
 

-      is_searching = true;
+      searching = true;

 
       Search::think();
 
 
       Search::think();
 

-      assert(is_searching);
+      assert(searching);
+
+      searching = false;

   }
 }
 
 
   }
 }
 
 

-// Thread::notify_one() wakes up the thread, normally at split time
+// Thread::notify_one() wakes up the thread when there is some search to do

 
 void Thread::notify_one() {
 
 
 void Thread::notify_one() {
 


@@ -162,7 +163,7 @@ bool Thread::cutoff_occurred() const {
 
 bool Thread::is_available_to(Thread* master) const {
 
 
 bool Thread::is_available_to(Thread* master) const {
 

-  if (is_searching)
+  if (searching)

       return false;
 
   // Make a local copy to be sure doesn't become zero under our feet while
       return false;
 
   // Make a local copy to be sure doesn't become zero under our feet while


@@ -283,7 +284,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   sp.nodes = 0;
   sp.ss = ss;
 
   sp.nodes = 0;
   sp.ss = ss;
 

-  assert(master->is_searching);
+  assert(master->searching);

 
   master->curSplitPoint = &sp;
   int slavesCnt = 0;
 
   master->curSplitPoint = &sp;
   int slavesCnt = 0;


@@ -299,7 +300,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
       {
           sp.slavesMask |= 1ULL << i;
           threads[i]->curSplitPoint = &sp;
       {
           sp.slavesMask |= 1ULL << i;
           threads[i]->curSplitPoint = &sp;

-          threads[i]->is_searching = true; // Slave leaves idle_loop()
+          threads[i]->searching = true; // Slave leaves idle_loop()

           threads[i]->notify_one(); // Could be sleeping
 
           if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
           threads[i]->notify_one(); // Could be sleeping
 
           if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included


@@ -321,7 +322,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
 
       // In helpful master concept a master can help only a sub-tree of its split
       // point, and because here is all finished is not possible master is booked.
 
       // In helpful master concept a master can help only a sub-tree of its split
       // point, and because here is all finished is not possible master is booked.

-      assert(!master->is_searching);
+      assert(!master->searching);

   }
 
   // We have returned from the idle loop, which means that all threads are
   }
 
   // We have returned from the idle loop, which means that all threads are


@@ -330,7 +331,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   mutex.lock();
   sp.mutex.lock();
 
   mutex.lock();
   sp.mutex.lock();
 

-  master->is_searching = true;
+  master->searching = true;

   master->splitPointsCnt--;
   master->curSplitPoint = sp.parent;
   pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
   master->splitPointsCnt--;
   master->curSplitPoint = sp.parent;
   pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);


@@ -347,24 +348,23 @@ 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);
 
 

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

 
 

-void ThreadPool::wait_for_search_finished() {
+void ThreadPool::wait_for_think_finished() {

 
   MainThread* t = main_thread();
   t->mutex.lock();
 
   MainThread* t = main_thread();
   t->mutex.lock();

-  while (!t->is_finished) sleepCondition.wait(t->mutex);
+  while (t->thinking) sleepCondition.wait(t->mutex);

   t->mutex.unlock();
 }
 
 
   t->mutex.unlock();
 }
 
 

-// start_searching() wakes up the main thread sleeping in  main_loop() so to start
+// start_thinking() wakes up the main thread sleeping in  main_loop() so to start

 // a new search, then returns immediately.
 
 // a new search, then returns immediately.
 

-void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
-                                 const std::vector<Move>& searchMoves, StateStackPtr& states) {
-  wait_for_search_finished();
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
+                                const std::vector<Move>& searchMoves, StateStackPtr& states) {
+  wait_for_think_finished();

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


@@ -380,6 +380,6 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
       if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
           RootMoves.push_back(RootMove(ml.move()));
 
       if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
           RootMoves.push_back(RootMove(ml.move()));
 

-  main_thread()->is_finished = false;
+  main_thread()->thinking = true;

   main_thread()->notify_one(); // Starts main thread
 }
   main_thread()->notify_one(); // Starts main thread
 }