X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.cpp;h=477fb392c6add636f01a46c7e0bf1b7ca51113c4;hb=06b9140e5ccd9e3579315ea2abb2ba93126c48fa;hp=125115a4cd57f8dc33724291b49014f0ce014b56;hpb=eb28a683bd5a15be4a59c1e14b45b2c80cf7bf2c;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 125115a4..477fb392 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,46 +17,30 @@
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
-#include
#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) {
@@ -67,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";
@@ -86,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,69 +95,85 @@ void dbg_print() {
}
-/// Our fancy logging facility. The trick here is to replace cout.rdbuf() with
-/// this one that sends the output both to console and to a file, this allow us
-/// to toggle the logging of std::cout to a file while preserving output to
-/// stdout and without changing a single line of code! Idea and code from:
-/// http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
+/// Our fancy logging facility. The trick here is to replace cin.rdbuf() and
+/// 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 {
-public:
- typedef char_traits traits_type;
- typedef traits_type::int_type int_type;
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
- Logger() : cout_buf(cout.rdbuf()) {}
- ~Logger() { set(false); }
+ Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
- void set(bool b) {
+ 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(), ">> "); }
- if (b && !file.is_open())
- {
- file.open("out.txt", ifstream::out | ifstream::app);
- cout.rdbuf(this);
- }
- else if (!b && file.is_open())
- {
- cout.rdbuf(cout_buf);
- file.close();
- }
+ streambuf* buf;
+ ofstream* file;
+
+ int log(int c, const char* prefix) {
+
+ static int last = '\n';
+
+ if (last == '\n')
+ file->rdbuf()->sputn(prefix, 3);
+
+ return last = file->rdbuf()->sputc((char)c);
}
+};
-private:
- int_type overflow(int_type c) {
+class Logger {
- if (traits_type::eq_int_type(c, traits_type::eof()))
- return traits_type::not_eof(c);
+ Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
- c = cout_buf->sputc(traits_type::to_char_type(c));
+ ofstream file;
+ Tie in, out;
+
+public:
+ static void start(bool b) {
- if (!traits_type::eq_int_type(c, traits_type::eof()))
- c = file.rdbuf()->sputc(traits_type::to_char_type(c));
+ static Logger l;
- return c;
+ if (b && !l.file.is_open())
+ {
+ l.file.open("io_log.txt", ifstream::out | ifstream::app);
+ cin.rdbuf(&l.in);
+ cout.rdbuf(&l.out);
+ }
+ else if (!b && l.file.is_open())
+ {
+ cout.rdbuf(l.out.buf);
+ cin.rdbuf(l.in.buf);
+ l.file.close();
+ }
}
+};
- int sync() {
- int c = cout_buf->pubsync();
+/// Used to serialize access to std::cout to avoid multiple threads to write at
+/// the same time.
- if (c != -1)
- c = file.rdbuf()->pubsync();
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
- return c;
- }
+ static Mutex m;
- ofstream file;
- streambuf* cout_buf;
-};
+ if (sc == io_lock)
+ m.lock();
-void logger_set(bool b) {
+ if (sc == io_unlock)
+ m.unlock();
- static Logger l;
- l.set(b);
+ return os;
}
+/// Trampoline helper to avoid moving Logger to misc.h
+void start_logger(bool b) { Logger::start(b); }
+
+
/// cpu_count() tries to detect the number of CPU cores
int cpu_count() {
@@ -176,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
@@ -203,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;
@@ -224,14 +229,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