X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=70359fdf77116adb652762d9c12fc9da8ba2560f;hp=78a91aff4d09e2a97976efca99ee20861b2ec33a;hb=6080fecf9cba9ac063f8f07bd25004c14016bd33;hpb=fad595f5b6b343708fc0b4d8ab15ab73040f84c1

diff --git a/src/main.cpp b/src/main.cpp
index 78a91aff..70359fdf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,8 +28,16 @@
 #include <iostream>
 #include <string>
 
+#include "bitboard.h"
 #include "bitcount.h"
+#include "endgame.h"
+#include "evaluate.h"
+#include "material.h"
 #include "misc.h"
+#include "position.h"
+#include "search.h"
+#include "thread.h"
+#include "ucioption.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
@@ -37,21 +45,29 @@
 
 using namespace std;
 
-extern void uci_main_loop();
-extern void benchmark(const std::string& commandLine);
+extern bool execute_uci_command(const string& cmd);
+extern void benchmark(int argc, char* argv[]);
 
 ////
 //// Functions
 ////
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 
   // Disable IO buffering
   cout.rdbuf()->pubsetbuf(NULL, 0);
   cin.rdbuf()->pubsetbuf(NULL, 0);
 
-  // Initialization through global resources manager
-  Application::initialize();
+  // Startup initializations
+  init_direction_table();
+  init_bitboards();
+  init_uci_options();
+  Position::init_zobrist();
+  Position::init_piece_square_tables();
+  init_eval(1);
+  init_bitbases();
+  init_search();
+  init_threads();
 
 #ifdef USE_CALLGRIND
   CALLGRIND_START_INSTRUMENTATION;
@@ -66,24 +82,30 @@ int main(int argc, char *argv[]) {
       if (CpuHasPOPCNT)
           cout << "Good! CPU has hardware POPCNT." << endl;
 
-      // Enter UCI mode
-      uci_main_loop();
+      // Wait for a command from the user, and passes this command to
+      // execute_uci_command() and also intercepts EOF from stdin, by
+      // translating EOF to the "quit" command. This ensures that we
+      // exit gracefully if the GUI dies unexpectedly.
+      string cmd;
+
+      do {
+          // Wait for a command from stdin
+          if (!getline(cin, cmd))
+              cmd = "quit";
+
+      } while (execute_uci_command(cmd));
   }
   else // Process command line arguments
   {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 7)
-          cout << "Usage: stockfish bench <hash size> <threads> "
+      if (string(argv[1]) != "bench" || argc > 7)
+          cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
                << "[limit = 12] [fen positions file = default] "
                << "[depth, time, perft or node limited = depth]" << endl;
       else
-      {
-          string val = argc > 4 ? argv[4] : "12";
-          string fen = argc > 5 ? argv[5] : "default";
-          string lim = argc > 6 ? argv[6] : "depth";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + val + " " + fen + " " + lim);
-      }
+          benchmark(argc, argv);
   }
 
-  Application::free_resources();
+  exit_threads();
+  quit_eval();
   return 0;
 }