Move ThreadsManager::exit() to d'tor

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a437f8839aface14cae7b15dede06a3cd2952d5a..3dcb3f6d9eb72c0777bee35146056acd787981a7 100644 (file)
--- 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -23,8 +23,8 @@
 #include "bitboard.h"
 #include "evaluate.h"
 #include "position.h"
-#include "thread.h"
 #include "search.h"
+#include "thread.h"
 #include "ucioption.h"
 
 using namespace std;
@@ -35,29 +35,24 @@ extern void kpk_bitbase_init();
 
 int main(int argc, char* argv[]) {
 
-  init_bitboards();
+  cout << engine_info() << endl;
+
+  bitboards_init();
   Position::init();
   kpk_bitbase_init();
   Search::init();
   Threads.init();
+  Eval::init();
+  TT.set_size(Options["Hash"]);
 
-  if (argc < 2)
-  {
-      cout << engine_name() << " by " << engine_authors() << endl;
+  if (argc == 1)
+      uci_loop();
 
-      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")
       benchmark(argc, argv);
 
   else
-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "
            << "[limit = 12] [fen positions file = default] "
            << "[limited by depth, time, nodes or perft = depth]" << endl;
-
-  Threads.exit();
-  return 0;
 }