X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=2b039161aa18cda7f12ec3aa490499c52da7a104;hb=348f8241041a26cd9458beb8098306099f44a46a;hp=e009fd964fd674008c0b4b1a4ca9649c115b56bd;hpb=5c81602d14539f8259a715477315e28b5de7cb54;p=stockfish

diff --git a/src/main.cpp b/src/main.cpp
index e009fd96..2b039161 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,67 +17,55 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
-
-////
-//// Includes
-////
-
+#include <cstdio>
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
-#include "misc.h"
-#include "uci.h"
-
-#ifdef USE_CALLGRIND
-#include <valgrind/callgrind.h>
-#endif
+#include "bitboard.h"
+#include "evaluate.h"
+#include "position.h"
+#include "thread.h"
+#include "search.h"
+#include "ucioption.h"
 
 using namespace std;
 
+extern void uci_loop();
+extern void benchmark(int argc, char* argv[]);
+extern void kpk_bitbase_init();
 
-////
-//// Functions
-////
+int main(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();
-
-#ifdef USE_CALLGRIND
-  CALLGRIND_START_INSTRUMENTATION;
-#endif
+  // Startup initializations
+  init_bitboards();
+  Position::init();
+  kpk_bitbase_init();
+  Search::init();
+  Threads.init();
 
-  // Process command line arguments if any
-  if (argc > 1)
+  if (argc < 2)
   {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 7)
-          cout << "Usage: stockfish bench <hash size> <threads> "
-               << "[time = 60s] [fen positions file = default] "
-               << "[time, depth or node limited = time]" << endl;
-      else
-      {
-          string time = argc > 4 ? argv[4] : "60";
-          string fen = argc > 5 ? argv[5] : "default";
-          string lim = argc > 6 ? argv[6] : "time";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen + " " + lim);
-      }
-      return 0;
+      cout << engine_name() << " by " << engine_authors() << endl;
+
+      if (CpuHasPOPCNT)
+          cout << "Good! CPU has hardware POPCNT." << endl;
+
+      uci_loop(); // Enter the UCI loop and wait for user input
   }
+  else if (string(argv[1]) == "bench" && argc < 8)
+      benchmark(argc, argv);
 
-  // Print copyright notice
-  cout << engine_name() << ".  Copyright (C) "
-       << "2004-2009 Tord Romstad, Marco Costalba. " << endl;
+  else
+      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+           << "[limit = 12] [fen positions file = default] "
+           << "[limited by depth, time, nodes or perft = depth]" << endl;
 
-  // Enter UCI mode
-  uci_main_loop();
+  Threads.exit();
   return 0;
 }