Correctly handle handover of setup states

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index ac58b43c2454495ff42cad4649704159b0a94139..31d0a721ab38f2038bccce775c1413bb1621f68e 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -17,7 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <deque>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -39,6 +38,10 @@ namespace {
   // FEN string of the initial position, normal chess
   const char* StartFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 
+  // Keep track of position keys along the setup moves (from start position to the
+  // position just before to start searching). Needed by repetition draw detection.
+  Search::StateStackPtr SetupStates;
+
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
   void go(Position& pos, istringstream& up);
@@ -155,10 +158,6 @@ namespace {
 
   void set_position(Position& pos, istringstream& is) {
 
-    // Keep track of position keys along the setup moves (from start position to the
-    // position just before to start searching). Needed by repetition draw detection.
-    static std::deque<StateInfo> st;
-
     Move m;
     string token, fen;
 
@@ -176,13 +175,13 @@ namespace {
         return;
 
     pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
-    st.clear();
+    SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
 
     // Parse move list (if any)
     while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
     {
-        st.push_back(StateInfo());
-        pos.do_move(m, st.back());
+        SetupStates->push(StateInfo());
+        pos.do_move(m, SetupStates->top());
     }
   }
 
@@ -248,6 +247,6 @@ namespace {
                 searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    Threads.start_searching(pos, limits, searchMoves);
+    Threads.start_searching(pos, limits, searchMoves, SetupStates);
   }
 }