X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=c0c00b009fa1ab347ebb97599a2a1e687d4346ca;hp=459c13ccccf887e6e72a8c8be9eafe633c6fed4c;hb=293c44bc09587259818a82e1d2afb511e552badd;hpb=dbe5e28eaa284aeaa4927ddde8a4341200e0e601
diff --git a/src/misc.cpp b/src/misc.cpp
index 459c13cc..c0c00b00 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
@@ -17,24 +17,6 @@
along with this program. If not, see .
*/
-#if defined(_WIN32) || defined(_WIN64)
-
-#define NOMINMAX // disable macros min() and max()
-#include
-
-#else
-
-# include
-# if defined(__hpux)
-# include
-# endif
-
-#endif
-
-#if !defined(NO_PREFETCH)
-# include
-#endif
-
#include
#include
#include
@@ -42,19 +24,23 @@
#include "misc.h"
#include "thread.h"
+#if defined(__hpux)
+# include
+#endif
+
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.
+/// date, in the format DD-MM-YY, are used as a version number.
static const string Version = "";
static const string Tag = "";
-/// engine_info() returns the full name of the current Stockfish version.
-/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
-/// the program was compiled) or "Stockfish ", depending
-/// on whether Version is empty.
+/// engine_info() returns the full name of the current Stockfish version. This
+/// will be either "Stockfish DD-MM-YY" (where DD-MM-YY is the date when
+/// the program was compiled) or "Stockfish ", depending on whether
+/// Version is empty.
const string engine_info(bool to_uci) {
@@ -65,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 << string(Tag.empty() ? "" : " ") << setfill('0') << setw(2) << day
+ << "-" << setw(2) << (1 + months.find(month) / 4) << "-" << year.substr(2);
}
- else
- s << "Stockfish " << Version;
s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
<< "Tord Romstad, Marco Costalba and Joona Kiiski";
@@ -84,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];
@@ -110,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;
@@ -162,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); }
@@ -200,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;
@@ -221,14 +229,19 @@ void prefetch(char*) {}
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