X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmisc.cpp;h=efa57a581acf1ebf96d146d202e126b2e2f5b077;hb=b71418defa4e7b0475fe9e16afdfdfefeab31e0f;hp=0db22dd2b39ca3f043e3fe905c5c074233495470;hpb=df80232495f9500c7d6ed197e40cebbc77175f07;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 0db22dd2..efa57a58 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,69 +17,42 @@
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"
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.
-
+/// Version number. If Version is left empty, then compile date in the format
+/// DD-MM-YY and show 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();
@@ -90,9 +63,9 @@ const string engine_info(bool to_uci) {
static uint64_t hits[2], means[2];
-void dbg_hit_on(bool b) { hits[0]++; if (b) hits[1]++; }
+void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; }
void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); }
-void dbg_mean_of(int v) { means[0]++; means[1] += v; }
+void dbg_mean_of(int v) { ++means[0]; means[1] += v; }
void dbg_print() {
@@ -102,135 +75,99 @@ void dbg_print() {
if (means[0])
cerr << "Total " << means[0] << " Mean "
- << (float)means[1] / means[0] << endl;
+ << (double)means[1] / means[0] << endl;
}
-/// 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
-
-class Tee: public streambuf {
-public:
- typedef char_traits traits_type;
- typedef traits_type::int_type int_type;
-
- Tee(ios& s, ofstream& f) : stream(s), file(f), stream_buf(s.rdbuf()) {}
- ~Tee() { set(false); }
-
- void set(bool b) { stream.rdbuf(b ? this : stream_buf); }
+/// 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 whilst preserving
+/// usual i/o functionality, all without changing a single line of code!
+/// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
-private:
- int_type overflow(int_type c) {
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
- if (traits_type::eq_int_type(c, traits_type::eof()))
- return traits_type::not_eof(c);
+ Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
- c = stream_buf->sputc(traits_type::to_char_type(c));
+ 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 (!traits_type::eq_int_type(c, traits_type::eof()))
- c = file.rdbuf()->sputc(traits_type::to_char_type(c));
+ streambuf* buf;
+ ofstream* file;
- return c;
- }
+ int log(int c, const char* prefix) {
- int sync() {
+ static int last = '\n';
- int c = stream_buf->pubsync();
+ if (last == '\n')
+ file->rdbuf()->sputn(prefix, 3);
- if (c != -1)
- c = file.rdbuf()->pubsync();
-
- return c;
+ return last = file->rdbuf()->sputc((char)c);
}
+};
- int underflow() { return traits_type::not_eof(stream_buf->sgetc()); }
-
- int uflow() {
-
- int c = stream_buf->sbumpc();
-
- if (!traits_type::eq_int_type(c, traits_type::eof()))
- file.rdbuf()->sputc(traits_type::to_char_type(c));
+class Logger {
- return traits_type::not_eof(c);
- }
+ Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
- ios& stream;
- ofstream& file;
- streambuf* stream_buf;
-};
+ ofstream file;
+ Tie in, out;
-class Logger {
public:
- Logger() : in(cin, file), out(cout, file) {}
- ~Logger() { set(false); }
+ static void start(bool b) {
- void set(bool b) {
+ static Logger l;
- if (b && !file.is_open())
+ if (b && !l.file.is_open())
{
- file.open("io_log.txt", ifstream::out | ifstream::app);
- in.set(true);
- out.set(true);
+ l.file.open("io_log.txt", ifstream::out | ifstream::app);
+ cin.rdbuf(&l.in);
+ cout.rdbuf(&l.out);
}
- else if (!b && file.is_open())
+ else if (!b && l.file.is_open())
{
- out.set(false);
- in.set(false);
- file.close();
+ cout.rdbuf(l.out.buf);
+ cin.rdbuf(l.in.buf);
+ l.file.close();
}
}
-
-private:
- Tee in, out;
- ofstream file;
};
-void logger_set(bool b) {
-
- static Logger l;
- l.set(b);
-}
+/// Used to serialize access to std::cout to avoid multiple threads writing at
+/// the same time.
-/// cpu_count() tries to detect the number of CPU cores
+std::ostream& operator<<(std::ostream& os, SyncCout sc) {
-int cpu_count() {
+ static Mutex m;
-#if defined(_WIN32) || defined(_WIN64)
- SYSTEM_INFO s;
- GetSystemInfo(&s);
- return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
-#else
+ if (sc == io_lock)
+ m.lock();
-# if defined(_SC_NPROCESSORS_ONLN)
- return std::min((int)sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
-# 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);
-# else
- return 1;
-# endif
+ if (sc == io_unlock)
+ m.unlock();
-#endif
+ return os;
}
-/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
-/// conversion from milliseconds to struct timespec, as used by pthreads.
+/// Trampoline helper to avoid moving Logger to misc.h
+void start_logger(bool b) { Logger::start(b); }
+
+
+/// timed_wait() waits for msec milliseconds. It is mainly a helper to wrap
+/// the conversion from milliseconds to struct timespec, as used by pthreads.
void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _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;
@@ -240,10 +177,10 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
}
-/// prefetch() preloads the given address in L1/L2 cache. This is a non
-/// blocking function and do not stalls the CPU waiting for data to be
-/// loaded from memory, that can be quite slow.
-#if defined(NO_PREFETCH)
+/// prefetch() preloads the given address in L1/L2 cache. This is a non-blocking
+/// function that doesn't stall the CPU waiting for data to be loaded from memory,
+/// which can be quite slow.
+#ifdef NO_PREFETCH
void prefetch(char*) {}
@@ -251,14 +188,17 @@ void prefetch(char*) {}
void prefetch(char* addr) {
-# if defined(__INTEL_COMPILER) || defined(__ICL)
- // This hack prevents prefetches to be optimized away by
- // Intel compiler. Both MSVC and gcc seems not affected.
+# if defined(__INTEL_COMPILER)
+ // This hack prevents prefetches from being optimized away by
+ // Intel compiler. Both MSVC and gcc seem not be affected by this.
__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