Retire platform specifics include in misc.cpp

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index bdb2cc27c4d31372165ebfff8e073f535c913064..3206a2d1950081229b0e9d3f623ba2db66dc8f81 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,25 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_WIN32) || defined(_WIN64)
-
-#define NOMINMAX // disable macros min() and max()
-#include <windows.h>
-
-#else
-
-#  include <unistd.h>
-#  if defined(__hpux)
-#     include <sys/pstat.h>
-#  endif
-
-#endif
-
-#if !defined(NO_PREFETCH)
-#  include <xmmintrin.h>
-#endif
-
-#include <algorithm>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -43,6 +24,10 @@
 #include "misc.h"
 #include "thread.h"
 
+#if defined(__hpux)
+#    include <sys/pstat.h>
+#endif
+
 using namespace std;
 
 /// Version number. If Version is left empty, then Tag plus current
@@ -106,16 +91,42 @@ 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 {
+class Logger {
 
-  Logger() : cinbuf(cin.rdbuf()), coutbuf(cout.rdbuf()) {}
+  Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {}
   ~Logger() { start(false); }
 
+  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(), ">> "); }
+
+    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);
+    }
+
+    streambuf* buf;
+    ofstream& file;
+  };
+
+  ofstream file;
+  Tie in, out;
+
 public:
   static void start(bool b) {
 
@@ -124,40 +135,20 @@ 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) {
-
-    static int last = '\n';
-
-    if (last == '\n')
-        file.rdbuf()->sputn(prefix, 3);
-
-    return last = file.rdbuf()->sputc((char)c);
-  }
-
-private:
-  ofstream file;
-  streambuf *cinbuf, *coutbuf;
 };
 
 
-/// 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 +159,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
@@ -214,6 +205,8 @@ void prefetch(char*) {}
 
 #else
 
+#   include <xmmintrin.h>
+
 void prefetch(char* addr) {
 
 #  if defined(__INTEL_COMPILER) || defined(__ICL)