X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=16ae0a6b338d5986dea9c03c0232771d4546eb20;hb=4064ee540649cb46ad4cc4a6080bd4ef41314cb9;hp=8bc413f47be9657217ce0151a0604702f3b100c0;hpb=3b7dbc4f6d68928ad97a5d77561509232dd23f78;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 8bc413f4..16ae0a6b 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,25 +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
#include
@@ -43,48 +24,52 @@
#include "misc.h"
#include "thread.h"
-using namespace std;
+#if defined(__hpux)
+# include
+#endif
-/// Version number. If Version is left empty, then Tag plus current
-/// date (in the format YYMMDD) is used as a version number.
+using namespace std;
+/// Version number. If Version is left empty, then compile date, in the
+/// format DD-MM-YY, is shown in engine_info.
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) {
const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
- const string cpu64(Is64Bit ? " 64bit" : "");
- const string popcnt(HasPopCnt ? " SSE4.2" : "");
-
string month, day, year;
stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
+ s << "Stockfish " << Version << setfill('0');
+
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 << 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 ")
+ s << (Is64Bit ? " 64" : "")
+ << (HasPopCnt ? " SSE4.2" : "")
+ << (to_uci ? "\nid author ": " by ")
<< "Tord Romstad, Marco Costalba and Joona Kiiski";
return s.str();
}
+/// 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];
@@ -111,33 +96,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;
@@ -163,6 +148,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); }
@@ -171,19 +173,19 @@ void start_logger(bool b) { Logger::start(b); }
int cpu_count() {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
SYSTEM_INFO s;
GetSystemInfo(&s);
- return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
+ return s.dwNumberOfProcessors;
#else
# if defined(_SC_NPROCESSORS_ONLN)
- return std::min((int)sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
+ return sysconf(_SC_NPROCESSORS_ONLN);
# elif defined(__hpux)
struct pst_dynamic psd;
if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
return 1;
- return std::min((int)psd.psd_proc_cnt, MAX_THREADS);
+ return psd.psd_proc_cnt;
# else
return 1;
# endif
@@ -197,11 +199,11 @@ int cpu_count() {
void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
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;
@@ -222,14 +224,17 @@ 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);
+# else
+ __builtin_prefetch(addr);
+# endif
}
#endif