X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=125115a4cd57f8dc33724291b49014f0ce014b56;hp=d0d2fcc018c9865099eff3db7fa0b7d21a94880b;hb=eb28a683bd5a15be4a59c1e14b45b2c80cf7bf2c;hpb=8300ab149cec54c2124898285bdc9308f78de4cd
diff --git a/src/misc.cpp b/src/misc.cpp
index d0d2fcc0..125115a4 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,17 +17,13 @@
along with this program. If not, see .
*/
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
-#define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX // disable macros min() and max()
#include
-#include
#else
-# include
-# include
# include
# if defined(__hpux)
# include
@@ -40,13 +36,11 @@
#endif
#include
-#include
-#include
#include
#include
#include
+#include
-#include "bitcount.h"
#include "misc.h"
#include "thread.h"
@@ -80,12 +74,12 @@ const string engine_info(bool to_uci) {
s << "Stockfish " << Tag
<< setfill('0') << " " << year.substr(2)
<< setw(2) << (1 + months.find(month) / 4)
- << setw(2) << day << cpu64 << popcnt;
+ << setw(2) << day;
}
else
- s << "Stockfish " << Version << cpu64 << popcnt;
+ s << "Stockfish " << Version;
- s << (to_uci ? "\nid author ": " by ")
+ s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
<< "Tord Romstad, Marco Costalba and Joona Kiiski";
return s.str();
@@ -112,19 +106,66 @@ void dbg_print() {
}
-/// system_time() returns the current system time, measured in milliseconds
+/// 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 Logger: public streambuf {
+public:
+ typedef char_traits traits_type;
+ typedef traits_type::int_type int_type;
+
+ Logger() : cout_buf(cout.rdbuf()) {}
+ ~Logger() { set(false); }
+
+ void set(bool b) {
+
+ 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();
+ }
+ }
-int system_time() {
+private:
+ int_type overflow(int_type c) {
-#if defined(_MSC_VER)
- struct _timeb t;
- _ftime(&t);
- return int(t.time * 1000 + t.millitm);
-#else
- struct timeval t;
- gettimeofday(&t, NULL);
- return t.tv_sec * 1000 + t.tv_usec / 1000;
-#endif
+ if (traits_type::eq_int_type(c, traits_type::eof()))
+ return traits_type::not_eof(c);
+
+ c = cout_buf->sputc(traits_type::to_char_type(c));
+
+ if (!traits_type::eq_int_type(c, traits_type::eof()))
+ c = file.rdbuf()->sputc(traits_type::to_char_type(c));
+
+ return c;
+ }
+
+ int sync() {
+
+ int c = cout_buf->pubsync();
+
+ if (c != -1)
+ c = file.rdbuf()->pubsync();
+
+ return c;
+ }
+
+ ofstream file;
+ streambuf* cout_buf;
+};
+
+void logger_set(bool b) {
+
+ static Logger l;
+ l.set(b);
}
@@ -132,7 +173,7 @@ int system_time() {
int cpu_count() {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
SYSTEM_INFO s;
GetSystemInfo(&s);
return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
@@ -156,24 +197,16 @@ int cpu_count() {
/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
/// conversion from milliseconds to struct timespec, as used by pthreads.
-void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
+void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
int tm = msec;
#else
- struct timeval t;
- struct timespec abstime, *tm = &abstime;
+ timespec ts, *tm = &ts;
+ uint64_t ms = Time::current_time().msec() + msec;
- gettimeofday(&t, NULL);
-
- abstime.tv_sec = t.tv_sec + (msec / 1000);
- abstime.tv_nsec = (t.tv_usec + (msec % 1000) * 1000) * 1000;
-
- if (abstime.tv_nsec > 1000000000LL)
- {
- abstime.tv_sec += 1;
- abstime.tv_nsec -= 1000000000LL;
- }
+ ts.tv_sec = ms / 1000;
+ ts.tv_nsec = (ms % 1000) * 1000000LL;
#endif
cond_timedwait(sleepCond, sleepLock, tm);