X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=b9a802ad3c3bdb4ccb2afe2abf06f2841f41fd8c;hp=16ae0a6b338d5986dea9c03c0232771d4546eb20;hb=8f5deaea61e8aa754b324b809cc8f7f394dc7e0f;hpb=5b7b330616b765c648d7d689403698223e9fee8e diff --git a/src/misc.cpp b/src/misc.cpp index 16ae0a6b..b9a802ad 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -24,10 +24,6 @@ #include "misc.h" #include "thread.h" -#if defined(__hpux) -# include -#endif - using namespace std; /// Version number. If Version is left empty, then compile date, in the @@ -63,20 +59,13 @@ const string engine_info(bool to_uci) { } -/// Convert system time to milliseconds. That's all we need. - -Time::point Time::now() { - sys_time_t t; system_time(&t); return time_to_msec(t); -} - - /// Debug functions used mainly to collect run-time statistics static uint64_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() { @@ -86,7 +75,7 @@ void dbg_print() { if (means[0]) cerr << "Total " << means[0] << " Mean " - << (float)means[1] / means[0] << endl; + << (double)means[1] / means[0] << endl; } @@ -169,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. void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) { -#if defined(_WIN32) +#ifdef _WIN32 int tm = msec; #else timespec ts, *tm = &ts; @@ -216,7 +180,7 @@ 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) +#ifdef NO_PREFETCH void prefetch(char*) {}