X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=0f0fca46624da7c0212b2971c72b0d8a02c2eae8;hb=7d2530873e6eb2b46ca2ffb548f9b993bbe1de41;hp=125115a4cd57f8dc33724291b49014f0ce014b56;hpb=eb28a683bd5a15be4a59c1e14b45b2c80cf7bf2c;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 125115a4..0f0fca46 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,33 +17,17 @@
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
@@ -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 << 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";
@@ -106,67 +88,66 @@ 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;
+class Logger {
- Logger() : cout_buf(cout.rdbuf()) {}
- ~Logger() { set(false); }
+ Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {}
+ ~Logger() { start(false); }
- void set(bool b) {
+ struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
- 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();
- }
- }
+ Tie(streambuf* b, ofstream& f) : buf(b), file(f) {}
-private:
- int_type overflow(int_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()))
- return traits_type::not_eof(c);
+ int log(int c, const char* prefix) {
- c = cout_buf->sputc(traits_type::to_char_type(c));
+ static int last = '\n';
- if (!traits_type::eq_int_type(c, traits_type::eof()))
- c = file.rdbuf()->sputc(traits_type::to_char_type(c));
+ if (last == '\n')
+ file.rdbuf()->sputn(prefix, 3);
- return c;
- }
+ return last = file.rdbuf()->sputc((char)c);
+ }
- int sync() {
+ streambuf* buf;
+ ofstream& file;
+ };
- int c = cout_buf->pubsync();
+ ofstream file;
+ Tie in, out;
- if (c != -1)
- c = file.rdbuf()->pubsync();
+public:
+ static void start(bool b) {
- return c;
- }
+ static Logger l;
- ofstream file;
- streambuf* cout_buf;
+ 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();
+ }
+ }
};
-void logger_set(bool b) {
- static Logger l;
- l.set(b);
-}
+/// 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
@@ -176,16 +157,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
@@ -222,6 +203,8 @@ void prefetch(char*) {}
#else
+# include
+
void prefetch(char* addr) {
# if defined(__INTEL_COMPILER) || defined(__ICL)