X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=fcb7e40c25118bf81f35a2361fd77d4d69840d33;hb=939b621e5c67e9ef89b409fd773d38058341906c;hp=4b716dded6ec859ca24e7afa67216dcdd4865e0d;hpb=786564068bb22c750c41649733d4aa6733accaec;p=stockfish
diff --git a/src/main.cpp b/src/main.cpp
index 4b716dde..fcb7e40c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,9 +17,6 @@
along with this program. If not, see .
*/
-// To profile with callgrind uncomment following line
-//#define USE_CALLGRIND
-
#include
#include
#include
@@ -28,60 +25,43 @@
#include "evaluate.h"
#include "position.h"
#include "thread.h"
+#include "search.h"
#include "ucioption.h"
-#ifdef USE_CALLGRIND
-#include
-#endif
-
using namespace std;
-extern bool execute_uci_command(const string& cmd);
+extern void uci_loop();
extern void benchmark(int argc, char* argv[]);
-extern void init_kpk_bitbase();
+extern void kpk_bitbase_init();
int main(int argc, char* argv[]) {
- // Disable IO buffering for C and C++ standard libraries
- setvbuf(stdin, NULL, _IONBF, 0);
+ // Disable output buffering: printf() does not work correctly otherwise
setvbuf(stdout, NULL, _IONBF, 0);
- cout.rdbuf()->pubsetbuf(NULL, 0);
- cin.rdbuf()->pubsetbuf(NULL, 0);
- // Startup initializations
- init_bitboards();
- Position::init_zobrist();
- Position::init_piece_square_tables();
- init_eval(1);
- init_kpk_bitbase();
- init_threads();
-
-#ifdef USE_CALLGRIND
- CALLGRIND_START_INSTRUMENTATION;
-#endif
+ bitboards_init();
+ Position::init();
+ kpk_bitbase_init();
+ Search::init();
+ Threads.init();
if (argc < 2)
{
- // Print copyright notice
cout << engine_name() << " by " << engine_authors() << endl;
if (CpuHasPOPCNT)
cout << "Good! CPU has hardware POPCNT." << endl;
- // Wait for a command from the user, and passes this command to
- // execute_uci_command() and also intercepts EOF from stdin to
- // ensure that we exit gracefully if the GUI dies unexpectedly.
- string cmd;
- while (getline(cin, cmd) && execute_uci_command(cmd)) {}
+ uci_loop(); // Enter the UCI loop and wait for user input
}
- else if (string(argv[1]) == "bench" && argc < 8)
+ else if (string(argv[1]) == "bench")
benchmark(argc, argv);
+
else
cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
<< "[limit = 12] [fen positions file = default] "
- << "[depth, time, perft or node limited = depth]" << endl;
+ << "[limited by depth, time, nodes or perft = depth]" << endl;
- exit_threads();
- quit_eval();
+ Threads.exit();
return 0;
}