Move struct RootMove to Search namespace

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index 832648015cfd362cf9488cca93c663b005fc1af4..1db61a20671e77376de2c7501175f2699f02b1c3 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include "movegen.h"
 #include "search.h"
 #include "thread.h"
 #include "ucioption.h"
@@ -367,7 +368,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 +377,7 @@ void Thread::timer_loop() {
       lock_grab(&sleepLock);
       timed_wait(&sleepCond, &sleepLock, maxPly ? maxPly : INT_MAX);
       lock_release(&sleepLock);
-      do_timer_event();
+      check_time();
   }
 }
 
@@ -420,7 +421,7 @@ void Thread::main_loop() {
       if (do_terminate)
           return;
 
-      think(); // This is the search entry point
+      Search::think();
   }
 }
 
@@ -431,7 +432,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 async) {
   Thread& main = threads[0];
 
   lock_grab(&main.sleepLock);
@@ -443,15 +444,22 @@ void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limit
   // Copy input arguments to initialize the search
   RootPosition.copy(pos, 0);
   Limits = limits;
-  SearchMoves = searchMoves;
+  RootMoves.clear();
+
+  // Populate RootMoves with all the legal moves (default) or, if a searchMoves
+  // set is given, with the subset of legal moves to search.
+  for (MoveList<MV_LEGAL> ml(pos); !ml.end(); ++ml)
+      if (searchMoves.empty() || searchMoves.count(ml.move()))
+          RootMoves.push_back(RootMove(ml.move()));
 
   // 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)
+  if (!async)
       while (!main.do_sleep)
           cond_wait(&sleepCond, &main.sleepLock);