Changeset 16832

Timestamp:

06/14/13 10:51:45 (12 years ago)

Author:

tbretz

Message:

Using a queue, to be able to decouple writing to the log-files from the disk load, but at the same time ensure that the data is flushed immediately and not buffered for a long time.

Location:

trunk/FACT++/src

Files:

• WindowLog.cc (modified) (2 diffs)
• WindowLog.h (modified) (4 diffs)

trunk/FACT++/src/WindowLog.cc

@@ -135 +135 @@
     fMuxFile.lock();
     fLogFile.close();
+    fMuxFile.unlock();
+}
+
+void WindowLog::WriteFile(const string &sout)
+{
+    fMuxFile.lock();
+    fLogFile << sout;
+    fLogFile.flush();
     fMuxFile.unlock();
 }
@@ -220 +228 @@
     }
 
+    fQueueFile.emplace(sout);
+    /*
     // Output everything also to the log-file
     fMuxFile.lock();
     fLogFile << sout;
-    fLogFile.flush();
+    //fLogFile.flush();
     fMuxFile.unlock();
-
+    */
     // If we are flushing because of an EOL, we reset also all attributes
 }

trunk/FACT++/src/WindowLog.h

@@ -8 +8 @@
 
 #include <ncurses.h> // A_NORMAL etc
+
+#include "queue.h"
 
 /// Stream manipulators to change the color of a WindowLog stream
@@ -74 +76 @@
     std::mutex fMuxWindow;     /// Mutex securing output to fWindow
 
+    Queue<std::string> fQueueFile;
+
     static std::string GetAnsiAttr(int m);
 
@@ -79 +83 @@
     void AddColor(int m);
 
+    void WriteFile(const std::string &);
     void WriteBuffer();
 
@@ -93 +98 @@
     //! Switch on screen output
     //
-    WindowLog() : std::ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fWindow(0), fIsNull(false), fEnableBacklog(true)
+    WindowLog() : std::ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fWindow(0), fIsNull(false), fEnableBacklog(true),
+        fQueueFile(std::bind(&WindowLog::WriteFile, this, std::placeholders::_1))
     {
-        fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering
+        //fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering
         setp(&fBuffer, &fBuffer+1);
         *this << '\0';
     }
-    WindowLog(WindowLog const& log) : std::ios(), std::streambuf(), std::ostream((std::streambuf*)&log), fWindow(log.fWindow), fIsNull(false), fEnableBacklog(true)
+    WindowLog(WindowLog const& log) : std::ios(), std::streambuf(), std::ostream((std::streambuf*)&log), fWindow(log.fWindow), fIsNull(false), fEnableBacklog(true),
+        fQueueFile(bind(&WindowLog::WriteFile, this, std::placeholders::_1))
     {
-        fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering
+        //fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering
+    }
+    ~WindowLog()
+    {
+        fQueueFile.wait(false);
     }