X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=75268175e0694048ca3ad0937e8dbbda2a79ee63;hp=e83c2cc5f94422dec45f4d77d1c0bf99a55190e0;hb=29fa6f3c5f8a700567a20c0dd2caf18876f736a0;hpb=660378d10e99f435df347f317878d7d2d9eade16

diff --git a/src/main.cpp b/src/main.cpp
index e83c2cc5..75268175 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,11 +25,20 @@
 //// Includes
 ////
 
+#include <cstdio>
 #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,7 +46,7 @@
 
 using namespace std;
 
-extern void uci_main_loop();
+extern bool execute_uci_command(const string& cmd);
 extern void benchmark(int argc, char* argv[]);
 
 ////
@@ -46,12 +55,21 @@ extern void benchmark(int argc, char* argv[]);
 
 int main(int argc, char* argv[]) {
 
-  // Disable IO buffering
+  // Disable IO buffering for C and C++ standard libraries
+  setvbuf(stdin, NULL, _IONBF, 0);
+  setvbuf(stdout, NULL, _IONBF, 0);
   cout.rdbuf()->pubsetbuf(NULL, 0);
   cin.rdbuf()->pubsetbuf(NULL, 0);
 
-  // Initialization through global resources manager
-  Application::initialize();
+  // Startup initializations
+  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;
@@ -60,25 +78,35 @@ int main(int argc, char* argv[]) {
   if (argc <= 1)
   {
       // Print copyright notice
-      cout << engine_name()
-           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+      cout << engine_name() << " by " << engine_author() << endl;
 
       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 > 7)
           cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
-               << "[limit = 12] [fen positions file = default] "
+               << "[limit = 11] [fen positions file = default] "
                << "[depth, time, perft or node limited = depth]" << endl;
       else
           benchmark(argc, argv);
   }
 
-  Application::free_resources();
+  exit_threads();
+  quit_eval();
   return 0;
 }