X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=f09694cc043607a6cd17d0409baf1e96c9537229;hp=aa2b23310da53ffd558bc41c4d62ece3c3dd8d33;hb=6fa6da3ee13d2b7bdbec3cd24ff8ca43233c74fb;hpb=170bdf40cd47f7f3a601107fae0a32667a9d72a9 diff --git a/src/misc.cpp b/src/misc.cpp index aa2b2331..f09694cc 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -146,7 +146,7 @@ void dbg_print() { std::ostream& operator<<(std::ostream& os, SyncCout sc) { - static Mutex m; + static std::mutex m; if (sc == IO_LOCK) m.lock(); @@ -162,35 +162,16 @@ std::ostream& operator<<(std::ostream& os, SyncCout sc) { void start_logger(bool b) { Logger::start(b); } -/// 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) { - -#ifdef _WIN32 - int tm = msec; -#else - timespec ts, *tm = &ts; - uint64_t ms = Time::now() + msec; - - ts.tv_sec = ms / 1000; - ts.tv_nsec = (ms % 1000) * 1000000LL; -#endif - - cond_timedwait(sleepCond, sleepLock, tm); -} - - /// 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*) {} +void prefetch(void*) {} #else -void prefetch(char* addr) { +void prefetch(void* addr) { # if defined(__INTEL_COMPILER) // This hack prevents prefetches from being optimized away by @@ -199,7 +180,7 @@ void prefetch(char* addr) { # endif # if defined(__INTEL_COMPILER) || defined(_MSC_VER) - _mm_prefetch(addr, _MM_HINT_T0); + _mm_prefetch((char*)addr, _MM_HINT_T0); # else __builtin_prefetch(addr); # endif