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

diff --git a/src/main.cpp b/src/main.cpp
index 47a03ad1..78a91aff 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
@@ -28,10 +28,8 @@
 #include <iostream>
 #include <string>
 
-#include "benchmark.h"
 #include "bitcount.h"
 #include "misc.h"
-#include "uci.h"
 
 #ifdef USE_CALLGRIND
 #include <valgrind/callgrind.h>
@@ -39,6 +37,8 @@
 
 using namespace std;
 
+extern void uci_main_loop();
+extern void benchmark(const std::string& commandLine);
 
 ////
 //// Functions
@@ -57,33 +57,33 @@ int main(int argc, char *argv[]) {
   CALLGRIND_START_INSTRUMENTATION;
 #endif
 
-  // Process command line arguments if any
-  if (argc > 1)
+  if (argc <= 1)
   {
-      if (string(argv[1]) != "bench" || argc < 4 || argc > 8)
+      // Print copyright notice
+      cout << engine_name()
+           << " by Tord Romstad, Marco Costalba, Joona Kiiski" << endl;
+
+      if (CpuHasPOPCNT)
+          cout << "Good! CPU has hardware POPCNT." << endl;
+
+      // Enter UCI mode
+      uci_main_loop();
+  }
+  else // Process command line arguments
+  {
+      if (string(argv[1]) != "bench" || argc < 4 || argc > 7)
           cout << "Usage: stockfish bench <hash size> <threads> "
-               << "[time = 60s] [fen positions file = default] "
-               << "[time, depth, perft or node limited = time] "
-               << "[timing file name = none]" << endl;
+               << "[limit = 12] [fen positions file = default] "
+               << "[depth, time, perft or node limited = depth]" << endl;
       else
       {
-          string time = argc > 4 ? argv[4] : "60";
+          string val = argc > 4 ? argv[4] : "12";
           string fen = argc > 5 ? argv[5] : "default";
-          string lim = argc > 6 ? argv[6] : "time";
-          string tim = argc > 7 ? argv[7] : "";
-          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + time + " " + fen + " " + lim + " " + tim);
+          string lim = argc > 6 ? argv[6] : "depth";
+          benchmark(string(argv[2]) + " " + string(argv[3]) + " " + val + " " + fen + " " + lim);
       }
-      return 0;
   }
 
-  // Print copyright notice
-  cout << engine_name()
-       << ". By Tord Romstad, Marco Costalba, Joona Kiiski." << endl;
-
-  if (CpuHasPOPCNT)
-      cout << "Good! CPU has hardware POPCNT. We will use it." << endl;
-
-  // Enter UCI mode
-  uci_main_loop();
+  Application::free_resources();
   return 0;
 }