Use a set to store SearchMoves

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index bc26d4df3462ffe354085bc6c2fe00688b2739a6..74ca48cc7e81ea175f734f31b9fb26828320067b 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -172,7 +172,7 @@ void ThreadsManager::init() {
   for (int i = 0; i <= MAX_THREADS; i++)
   {
       threads[i].is_searching = false;
-      threads[i].do_sleep = true;
+      threads[i].do_sleep = (i != 0); // Avoid a race with start_thinking()
       threads[i].threadID = i;
 
 #if defined(_MSC_VER)
@@ -202,7 +202,7 @@ void ThreadsManager::exit() {
 
       // Wait for thread termination
 #if defined(_MSC_VER)
-      WaitForSingleObject(threads[i].handle, 0);
+      WaitForSingleObject(threads[i].handle, INFINITE);
       CloseHandle(threads[i].handle);
 #else
       pthread_join(threads[i].handle, NULL);
@@ -367,7 +367,7 @@ template Value ThreadsManager::split<true>(Position&, Stack*, Value, Value, Valu
 
 // Thread::timer_loop() is where the timer thread waits maxPly milliseconds and
 // then calls do_timer_event(). If maxPly is 0 thread sleeps until is woken up.
-extern void do_timer_event();
+extern void check_time();
 
 void Thread::timer_loop() {
 
@@ -376,7 +376,7 @@ void Thread::timer_loop() {
       lock_grab(&sleepLock);
       timed_wait(&sleepCond, &sleepLock, maxPly ? maxPly : INT_MAX);
       lock_release(&sleepLock);
-      do_timer_event();
+      check_time();
   }
 }
 
@@ -431,7 +431,7 @@ void Thread::main_loop() {
 // the search to finish.
 
 void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limits,
-                                    const std::vector<Move>& searchMoves, bool asyncMode) {
+                                    const std::set<Move>& searchMoves, bool asyncMode) {
   Thread& main = threads[0];
 
   lock_grab(&main.sleepLock);
@@ -446,13 +446,15 @@ void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limit
   SearchMoves = searchMoves;
 
   // Reset signals before to start the new search
-  memset((void*)&Signals, 0, sizeof(Signals));
+  Signals.stopOnPonderhit = Signals.firstRootMove = false;
+  Signals.stop = Signals.failedLowAtRoot = false;
 
   main.do_sleep = false;
   cond_signal(&main.sleepCond); // Wake up main thread and start searching
 
   if (!asyncMode)
-      cond_wait(&sleepCond, &main.sleepLock);
+      while (!main.do_sleep)
+          cond_wait(&sleepCond, &main.sleepLock);
 
   lock_release(&main.sleepLock);
 }