Fix a race in pondering mode

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e6dfe9344d5837a8194839aa7680927d46a75f3e..202cf5f36484a8891942d0a7cab7b4b8c163527d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,9 +37,9 @@
 
 using namespace std;
 
-extern bool execute_uci_command(const string& cmd);
+extern void uci_loop();
 extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
+extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
@@ -51,10 +51,9 @@ int main(int argc, char* argv[]) {
 
   // Startup initializations
   init_bitboards();
-  Position::init_zobrist();
-  Position::init_piece_square_tables();
-  init_kpk_bitbase();
-  init_search();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
   Threads.init();
 
 #ifdef USE_CALLGRIND
@@ -69,11 +68,8 @@ int main(int argc, char* argv[]) {
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
 
-      // Wait for a command from the user, and passes this command to
-      // execute_uci_command() and also intercepts EOF from stdin to
-      // ensure that we exit gracefully if the GUI dies unexpectedly.
-      string cmd;
-      while (getline(cin, cmd) && execute_uci_command(cmd)) {}
+      // Enter the UCI loop waiting for input
+      uci_loop();
   }
   else if (string(argv[1]) == "bench" && argc < 8)
       benchmark(argc, argv);