X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=d18f48d6e8a7c24a1c4eb7c679cb770e8af4717b;hp=ed6f8f47abe60a195ae30043c193462f2298a00a;hb=4fa0395eb8db33b23c2a91e4b255021fd940d811;hpb=a1c02815ccc5824fe8737d1d6fab8aef09874a07 diff --git a/src/misc.cpp b/src/misc.cpp index ed6f8f47..d18f48d6 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -67,8 +67,8 @@ static const string AppTag = ""; //// Variables //// -uint64_t dbg_cnt0 = 0; -uint64_t dbg_cnt1 = 0; +static uint64_t dbg_cnt0 = 0; +static uint64_t dbg_cnt1 = 0; bool dbg_show_mean = false; bool dbg_show_hit_rate = false; @@ -127,42 +127,29 @@ void dbg_print_mean() { << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; } -void dbg_print_hit_rate(ofstream& logFile) { - - logFile << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1 - << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1) << endl; -} - -void dbg_print_mean(ofstream& logFile) { - - logFile << "Total " << dbg_cnt0 << " Mean " - << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << endl; -} /// engine_name() returns the full name of the current Stockfish version. -/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when the -/// program was compiled) or "Stockfish ", depending on whether -/// the constant EngineVersion (defined in misc.h) is empty. +/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when +/// the program was compiled) or "Stockfish ", depending +/// on whether the constant EngineVersion (defined in misc.h) is empty. const string engine_name() { + const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); const string cpu64(CpuIs64Bit ? " 64bit" : ""); if (!EngineVersion.empty()) return AppName + " " + EngineVersion + cpu64; - string date(__DATE__); // From compiler, format is "Sep 21 2008" - string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); - - size_t mon = 1 + months.find(date.substr(0, 3)) / 4; - - stringstream s; - string day = (date[4] == ' ' ? date.substr(5, 1) : date.substr(4, 2)); + stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008" + string month, day, year; - string name = AppName + " " + AppTag + " "; + date >> month >> day >> year; - s << name << date.substr(date.length() - 2) << setfill('0') - << setw(2) << mon << setw(2) << day << cpu64; + s << setfill('0') << AppName + " " + AppTag + " " + << year.substr(2, 2) << setw(2) + << (1 + months.find(month) / 4) << setw(2) + << day << cpu64; return s.str(); } @@ -241,19 +228,19 @@ int data_available() int data_available() { static HANDLE inh = NULL; - static bool usePipe; + static bool usePipe = false; INPUT_RECORD rec[256]; DWORD dw, recCnt; if (!inh) { inh = GetStdHandle(STD_INPUT_HANDLE); - usePipe = !GetConsoleMode(inh, &dw); - if (!usePipe) + if (GetConsoleMode(inh, &dw)) { SetConsoleMode(inh, dw & ~(ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT)); FlushConsoleInputBuffer(inh); - } + } else + usePipe = true; } // If we're running under XBoard then we can't use PeekConsoleInput() as