X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=608d772501fc54c70967d16e55ed80ba9cccb573;hp=bdb2cc27c4d31372165ebfff8e073f535c913064;hb=dae843d4d6cba8593a0426c9a2f7418a3c76d7f8;hpb=17d1940278aadde3d9d844f7c913ca6c8655bbf3
diff --git a/src/misc.cpp b/src/misc.cpp
index bdb2cc27..608d7725 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -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,6 +24,10 @@
#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
@@ -66,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";
@@ -85,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];
@@ -106,15 +96,41 @@ void dbg_print() {
/// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
-/// cout.rdbuf() with this one that tees cin and cout to a file stream. We can
-/// toggle the logging of std::cout and std:cin at runtime while preserving i/o
-/// functionality and without changing a single line of code!
+/// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We
+/// can toggle the logging of std::cout and std:cin at runtime while preserving
+/// 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: public streambuf {
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
+
+ Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
+
+ 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(), ">> "); }
+
+ streambuf* buf;
+ ofstream* file;
+
+ int log(int c, const char* prefix) {
+
+ static int last = '\n';
- Logger() : cinbuf(cin.rdbuf()), coutbuf(cout.rdbuf()) {}
- ~Logger() { start(false); }
+ if (last == '\n')
+ file->rdbuf()->sputn(prefix, 3);
+
+ return last = file->rdbuf()->sputc((char)c);
+ }
+};
+
+class Logger {
+
+ Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
+
+ ofstream file;
+ Tie in, out;
public:
static void start(bool b) {
@@ -124,40 +140,37 @@ public:
if (b && !l.file.is_open())
{
l.file.open("io_log.txt", ifstream::out | ifstream::app);
- cin.rdbuf(&l);
- cout.rdbuf(&l);
+ cin.rdbuf(&l.in);
+ cout.rdbuf(&l.out);
}
else if (!b && l.file.is_open())
{
- cout.rdbuf(l.coutbuf);
- cin.rdbuf(l.cinbuf);
+ cout.rdbuf(l.out.buf);
+ cin.rdbuf(l.in.buf);
l.file.close();
}
}
+};
-private:
- int sync() { return file.rdbuf()->pubsync(), coutbuf->pubsync(); }
- int overflow(int c) { return log(coutbuf->sputc((char)c), "<< ") ; }
- int underflow() { return cinbuf->sgetc(); }
- int uflow() { return log(cinbuf->sbumpc(), ">> "); }
- int log(int c, const char* prefix) {
+/// Used to serialize access to std::cout to avoid multiple threads to write at
+/// the same time.
- static int last = '\n';
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
- if (last == '\n')
- file.rdbuf()->sputn(prefix, 3);
+ static Mutex m;
- return last = file.rdbuf()->sputc((char)c);
- }
+ if (sc == io_lock)
+ m.lock();
-private:
- ofstream file;
- streambuf *cinbuf, *coutbuf;
-};
+ if (sc == io_unlock)
+ m.unlock();
+
+ return os;
+}
-/// Trampoline helper to avoid moving Logger to misc.h header
+/// Trampoline helper to avoid moving Logger to misc.h
void start_logger(bool b) { Logger::start(b); }
@@ -168,16 +181,16 @@ int cpu_count() {
#if defined(_WIN32) || defined(_WIN64)
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
@@ -195,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;
@@ -216,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