Remove cruft from Logger class

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 125115a4cd57f8dc33724291b49014f0ce014b56..bdb2cc27c4d31372165ebfff8e073f535c913064 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -39,7 +39,6 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <streambuf>
 
 #include "misc.h"
 #include "thread.h"
@@ -106,67 +105,60 @@ 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 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!
+/// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
 
 class Logger: public streambuf {
-public:
-  typedef char_traits<char> traits_type;
-  typedef traits_type::int_type int_type;
 
-  Logger() : cout_buf(cout.rdbuf()) {}
-  ~Logger() { set(false); }
+  Logger() : cinbuf(cin.rdbuf()), coutbuf(cout.rdbuf()) {}
+  ~Logger() { start(false); }
+
+public:
+  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("out.txt", ifstream::out | ifstream::app);
-        cout.rdbuf(this);
+        l.file.open("io_log.txt", ifstream::out | ifstream::app);
+        cin.rdbuf(&l);
+        cout.rdbuf(&l);
     }
-    else if (!b && file.is_open())
+    else if (!b && l.file.is_open())
     {
-        cout.rdbuf(cout_buf);
-        file.close();
+        cout.rdbuf(l.coutbuf);
+        cin.rdbuf(l.cinbuf);
+        l.file.close();
     }
   }
 
 private:
-  int_type overflow(int_type c) {
-
-    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));
+  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(), ">> "); }
 
-    if (!traits_type::eq_int_type(c, traits_type::eof()))
-        c = file.rdbuf()->sputc(traits_type::to_char_type(c));
+  int log(int c, const char* prefix) {
 
-    return c;
-  }
-
-  int sync() {
-
-    int c = cout_buf->pubsync();
+    static int last = '\n';
 
-    if (c != -1)
-        c = file.rdbuf()->pubsync();
+    if (last == '\n')
+        file.rdbuf()->sputn(prefix, 3);
 
-    return c;
+    return last = file.rdbuf()->sputc((char)c);
   }
 
+private:
   ofstream file;
-  streambuf* cout_buf;
+  streambuf *cinbuf, *coutbuf;
 };
 
-void logger_set(bool b) {
 
-  static Logger l;
-  l.set(b);
-}
+/// Trampoline helper to avoid moving Logger to misc.h header
+void start_logger(bool b) { Logger::start(b); }
 
 
 /// cpu_count() tries to detect the number of CPU cores