X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=b5a14dbed2a24bf7b8b0f5111da54db50f0ddd04;hp=2d14def3a289b73ec9e481cc1672b84528671946;hb=f5622cd5ec7836e899e263cc4cd4cc386e1ed5f4;hpb=abb40777bf7dbfd2f5250840f84b4c6965719f46 diff --git a/src/misc.cpp b/src/misc.cpp index 2d14def3..b5a14dbe 100644 --- a/src/misc.cpp +++ b/src/misc.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-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 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 @@ -24,17 +24,11 @@ #include "misc.h" #include "thread.h" -#if defined(__hpux) -# include -#endif - using namespace std; -/// Version number. If Version is left empty, then Tag plus current -/// date, in the format DD-MM-YY, are used as a version number. - +/// Version number. If Version is left empty, then compile date in the format +/// DD-MM-YY and show in engine_info. static const string Version = ""; -static const string Tag = ""; /// engine_info() returns the full name of the current Stockfish version. This @@ -46,41 +40,32 @@ const string engine_info(bool to_uci) { const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"); string month, day, year; - stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008" + stringstream ss, date(__DATE__); // From compiler, format is "Sep 21 2008" - s << "Stockfish " << Version; + ss << "Stockfish " << Version << setfill('0'); if (Version.empty()) { date >> month >> day >> year; - - s << Tag << string(Tag.empty() ? "" : " ") << setfill('0') << setw(2) << day - << setw(2) << (1 + months.find(month) / 4) << year.substr(2); + ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2); } - s << (Is64Bit ? " 64" : "") - << (HasPopCnt ? " SSE4.2" : "") - << (to_uci ? "\nid author ": " by ") - << "Tord Romstad, Marco Costalba and Joona Kiiski"; - - return s.str(); -} - - -/// Convert system time to milliseconds. That's all we need. + ss << (Is64Bit ? " 64" : "") + << (HasPext ? " BMI2" : (HasPopCnt ? " SSE4.2" : "")) + << (to_uci ? "\nid author ": " by ") + << "Tord Romstad, Marco Costalba and Joona Kiiski"; -Time::point Time::now() { - sys_time_t t; system_time(&t); return time_to_msec(t); + return ss.str(); } /// Debug functions used mainly to collect run-time statistics -static uint64_t hits[2], means[2]; +static int64_t hits[2], means[2]; -void dbg_hit_on(bool b) { hits[0]++; if (b) hits[1]++; } +void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; } void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); } -void dbg_mean_of(int v) { means[0]++; means[1] += v; } +void dbg_mean_of(int v) { ++means[0]; means[1] += v; } void dbg_print() { @@ -90,14 +75,14 @@ void dbg_print() { if (means[0]) cerr << "Total " << means[0] << " Mean " - << (float)means[1] / means[0] << endl; + << (double)means[1] / means[0] << endl; } /// Our fancy logging facility. The trick here is to replace cin.rdbuf() and /// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We -/// can toggle the logging of std::cout and std:cin at runtime while preserving -/// usual i/o functionality and without changing a single line of code! +/// can toggle the logging of std::cout and std:cin at runtime whilst preserving +/// usual i/o functionality, all without changing a single line of code! /// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81 struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout @@ -152,17 +137,17 @@ public: }; -/// Used to serialize access to std::cout to avoid multiple threads to write at +/// Used to serialize access to std::cout to avoid multiple threads writing at /// the same time. std::ostream& operator<<(std::ostream& os, SyncCout sc) { static Mutex m; - if (sc == io_lock) + if (sc == IO_LOCK) m.lock(); - if (sc == io_unlock) + if (sc == IO_UNLOCK) m.unlock(); return os; @@ -173,37 +158,12 @@ std::ostream& operator<<(std::ostream& os, SyncCout sc) { void start_logger(bool b) { Logger::start(b); } -/// cpu_count() tries to detect the number of CPU cores - -int cpu_count() { - -#if defined(_WIN32) - SYSTEM_INFO s; - GetSystemInfo(&s); - return s.dwNumberOfProcessors; -#else - -# if defined(_SC_NPROCESSORS_ONLN) - return sysconf(_SC_NPROCESSORS_ONLN); -# elif defined(__hpux) - struct pst_dynamic psd; - if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1) - return 1; - return psd.psd_proc_cnt; -# else - return 1; -# endif - -#endif -} - - -/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap -/// conversion from milliseconds to struct timespec, as used by pthreads. +/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap +/// the conversion from milliseconds to struct timespec, as used by pthreads. void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { -#if defined(_WIN32) +#ifdef _WIN32 int tm = msec; #else timespec ts, *tm = &ts; @@ -217,10 +177,10 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { } -/// prefetch() preloads the given address in L1/L2 cache. This is a non -/// blocking function and do not stalls the CPU waiting for data to be -/// loaded from memory, that can be quite slow. -#if defined(NO_PREFETCH) +/// prefetch() preloads the given address in L1/L2 cache. This is a non-blocking +/// function that doesn't stall the CPU waiting for data to be loaded from memory, +/// which can be quite slow. +#ifdef NO_PREFETCH void prefetch(char*) {} @@ -229,8 +189,8 @@ void prefetch(char*) {} void prefetch(char* addr) { # if defined(__INTEL_COMPILER) - // This hack prevents prefetches to be optimized away by - // Intel compiler. Both MSVC and gcc seems not affected. + // This hack prevents prefetches from being optimized away by + // Intel compiler. Both MSVC and gcc seem not be affected by this. __asm__ (""); # endif