X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=50412468ebb83222caf15a8b4b9835f018b7aa63;hp=42ffe63a48a2a9dbe4a4b89b7850c3a184ebde5c;hb=8dcb4bc3cce1f487cfac65ed20d21378d0f39b2e;hpb=b6883c872d267cf464c575d2a901e117f6a97a84

diff --git a/src/thread.cpp b/src/thread.cpp
index 42ffe63a..50412468 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -114,6 +114,8 @@ void Thread::main_loop() {
       is_searching = true;
 
       Search::think();
+
+      assert(is_searching);
   }
 }
 
@@ -194,11 +196,11 @@ void ThreadPool::init() {
 }
 
 
-// d'tor cleanly terminates the threads when the program exits.
+// exit() cleanly terminates the threads before the program exits.
 
-ThreadPool::~ThreadPool() {
+void ThreadPool::exit() {
 
-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)
       delete threads[i];
 
   delete timer;
@@ -219,10 +221,10 @@ void ThreadPool::read_uci_options() {
 
   assert(requested > 0);
 
-  while (size() < requested)
+  while (threads.size() < requested)
       threads.push_back(new Thread(&Thread::idle_loop));
 
-  while (size() > requested)
+  while (threads.size() > requested)
   {
       delete threads.back();
       threads.pop_back();
@@ -236,7 +238,7 @@ void ThreadPool::read_uci_options() {
 
 void ThreadPool::wake_up() const {
 
-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)
   {
       threads[i]->maxPly = 0;
       threads[i]->do_sleep = false;
@@ -252,8 +254,9 @@ void ThreadPool::wake_up() const {
 
 void ThreadPool::sleep() const {
 
-  for (size_t i = 1; i < size(); i++) // Main thread will go to sleep by itself
-      threads[i]->do_sleep = true; // to avoid a race with start_searching()
+  // Main thread will go to sleep by itself to avoid a race with start_searching()
+  for (size_t i = 1; i < threads.size(); i++)
+      threads[i]->do_sleep = true;
 }
 
 
@@ -262,7 +265,7 @@ void ThreadPool::sleep() const {
 
 bool ThreadPool::available_slave_exists(Thread* master) const {
 
-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)
       if (threads[i]->is_available_to(master))
           return true;
 
@@ -327,7 +330,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   sp.mutex.lock();
   mutex.lock();
 
-  for (size_t i = 0; i < size() && !Fake; ++i)
+  for (size_t i = 0; i < threads.size() && !Fake; ++i)
       if (threads[i]->is_available_to(master))
       {
           sp.slavesMask |= 1ULL << i;
@@ -411,7 +414,7 @@ void ThreadPool::wait_for_search_finished() {
 // a new search, then returns immediately.
 
 void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
-                                 const std::vector<Move>& searchMoves) {
+                                 const std::vector<Move>& searchMoves, StateStackPtr& states) {
   wait_for_search_finished();
 
   SearchTime.restart(); // As early as possible
@@ -421,6 +424,7 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
 
   RootPosition = pos;
   Limits = limits;
+  SetupStates = states; // Ownership transfer here
   RootMoves.clear();
 
   for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)