X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=daafd3fb650cbd009cee475402474f2786d43871;hb=a6f873cd8d05dda3638a7ea624ccbac90ecb98af;hp=3306eca49164b9e909960e45e7a4777a868c523a;hpb=5154ac9cff432574eefd461c54eb646ddf6e96e6;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 3306eca4..daafd3fb 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -26,12 +27,13 @@
#include "thread.h"
using namespace std;
+using namespace std::chrono;
namespace {
/// Version number. If Version is left empty, then compile date in the format
/// DD-MM-YY and show in engine_info.
-const string Version = "6 RC2";
+const string Version = "";
/// Debug counters
int64_t hits[2], means[2];
@@ -123,10 +125,17 @@ const string engine_info(bool to_uci) {
}
+/// Convert system time to milliseconds. That's all we need.
+
+Time::point Time::now() {
+ return duration_cast(steady_clock::now().time_since_epoch()).count();
+}
+
+
/// Debug functions used mainly to collect run-time statistics
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_hit_on(bool c, bool b) { if (c) dbg_hit_on(b); }
void dbg_mean_of(int v) { ++means[0]; means[1] += v; }
void dbg_print() {
@@ -146,7 +155,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 +171,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 +189,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