X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=33c3f1f70acceb9287ab08a36aed4db62a432064;hp=3206a2d1950081229b0e9d3f623ba2db66dc8f81;hb=0a18adb02ac375f7d7fc31ef76b59e13a0263773;hpb=72641dcaae2241c830254fc19b742eb477d831a3

diff --git a/src/misc.cpp b/src/misc.cpp
index 3206a2d1..33c3f1f7 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -33,7 +33,7 @@ using namespace std;
 /// Version number. If Version is left empty, then Tag plus current
 /// date (in the format YYMMDD) is used as a version number.
 
-static const string Version = "";
+static const string Version = "2.3";
 static const string Tag = "";
 
 
@@ -51,17 +51,15 @@ const string engine_info(bool to_uci) {
   string month, day, year;
   stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
 
+  s << "Stockfish " << Version;
+
   if (Version.empty())
   {
       date >> month >> day >> year;
 
-      s << "Stockfish " << Tag
-        << setfill('0') << " " << year.substr(2)
-        << setw(2) << (1 + months.find(month) / 4)
-        << setw(2) << day;
+      s << Tag << setfill('0') << " " << year.substr(2)
+        << setw(2) << (1 + months.find(month) / 4) << setw(2) << day;
   }
-  else
-      s << "Stockfish " << Version;
 
   s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
     << "Tord Romstad, Marco Costalba and Joona Kiiski";
@@ -70,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];
@@ -96,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;
@@ -148,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); }
 
@@ -186,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;