X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=e47e377538bbb6ba6a27c180c80f701e074c38f7;hb=335b57b5ef85da22b7e26cdfc1fd7b3e28dbbe8d;hp=0f0fca46624da7c0212b2971c72b0d8a02c2eae8;hpb=7a8429d9f15a45c5a60f98c4aed798d10d511300;p=stockfish

diff --git a/src/misc.cpp b/src/misc.cpp
index 0f0fca46..e47e3775 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2013 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
@@ -68,6 +68,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];
@@ -94,33 +101,33 @@ void dbg_print() {
 /// usual i/o functionality and without changing a single line of code!
 /// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
 
-class Logger {
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
 
-  Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {}
-  ~Logger() { start(false); }
+  Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
 
-  struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
+  int sync() { return file->rdbuf()->pubsync(), buf->pubsync(); }
+  int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
+  int underflow() { return buf->sgetc(); }
+  int uflow() { return log(buf->sbumpc(), ">> "); }
 
-    Tie(streambuf* b, ofstream& f) : buf(b), file(f) {}
+  streambuf* buf;
+  ofstream* file;
 
-    int sync() { return file.rdbuf()->pubsync(), buf->pubsync(); }
-    int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
-    int underflow() { return buf->sgetc(); }
-    int uflow() { return log(buf->sbumpc(), ">> "); }
+  int log(int c, const char* prefix) {
 
-    int log(int c, const char* prefix) {
+    static int last = '\n';
 
-      static int last = '\n';
+    if (last == '\n')
+        file->rdbuf()->sputn(prefix, 3);
 
-      if (last == '\n')
-          file.rdbuf()->sputn(prefix, 3);
+    return last = file->rdbuf()->sputc((char)c);
+  }
+};
 
-      return last = file.rdbuf()->sputc((char)c);
-    }
+class Logger {
 
-    streambuf* buf;
-    ofstream& file;
-  };
+  Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
 
   ofstream file;
   Tie in, out;
@@ -146,6 +153,23 @@ public:
 };
 
 
+/// Used to serialize access to std::cout to avoid multiple threads to write at
+/// the same time.
+
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
+
+  static Mutex m;
+
+  if (sc == io_lock)
+      m.lock();
+
+  if (sc == io_unlock)
+      m.unlock();
+
+  return os;
+}
+
+
 /// Trampoline helper to avoid moving Logger to misc.h
 void start_logger(bool b) { Logger::start(b); }
 
@@ -184,7 +208,7 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
   int tm = msec;
 #else
   timespec ts, *tm = &ts;
-  uint64_t ms = Time::current_time().msec() + msec;
+  uint64_t ms = Time::now() + msec;
 
   ts.tv_sec = ms / 1000;
   ts.tv_nsec = (ms % 1000) * 1000000LL;
@@ -203,18 +227,21 @@ void prefetch(char*) {}
 
 #else
 
-#   include <xmmintrin.h>
-
 void prefetch(char* addr) {
 
-#  if defined(__INTEL_COMPILER) || defined(__ICL)
+#  if defined(__INTEL_COMPILER)
    // This hack prevents prefetches to be optimized away by
    // Intel compiler. Both MSVC and gcc seems not affected.
    __asm__ ("");
 #  endif
 
-  _mm_prefetch(addr, _MM_HINT_T2);
-  _mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead
+#  if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+  _mm_prefetch(addr, _MM_HINT_T0);
+  _mm_prefetch(addr+64, _MM_HINT_T0); // 64 bytes ahead
+#  else
+  __builtin_prefetch(addr);
+  __builtin_prefetch(addr+64);
+#  endif
 }
 
 #endif