From 6f4c7800897168a8029a159b372cb23ca9581a5f Mon Sep 17 00:00:00 2001
From: gabime <galim120@bezeqint.net>
Date: Sat, 22 Feb 2014 11:57:53 +0200
Subject: [PATCH] flush_helper

---
 example/example.cpp                   |  4 ++--
 include/c11log/details/flush_helper.h | 25 +++++++++++++++++++++
 include/c11log/sinks/file_sinks.h     | 32 +++++++++++++++------------
 3 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 include/c11log/details/flush_helper.h

diff --git a/example/example.cpp b/example/example.cpp
index 75d3750f..bf08ab72 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -60,12 +60,12 @@ int main(int argc, char* argv[])
     auto null_sink = std::make_shared<sinks::null_sink>();
     auto stdout_sink = std::make_shared<sinks::stdout_sink>();
     auto async = std::make_shared<sinks::async_sink>(qsize);
-    auto fsink = std::make_shared<sinks::rotating_file_sink>("example_log", "txt", 1024*1024*50 , 5);
+    auto fsink = std::make_shared<sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5, 1000);
 
     async->add_sink(fsink);
 
     auto &logger = c11log::get_logger("async");
-    logger.add_sink(async);
+    logger.add_sink(fsink);
 
     testlog(threads);
 }
diff --git a/include/c11log/details/flush_helper.h b/include/c11log/details/flush_helper.h
new file mode 100644
index 00000000..41ece7d3
--- /dev/null
+++ b/include/c11log/details/flush_helper.h
@@ -0,0 +1,25 @@
+#pragma once
+
+// Flush to file every X writes..
+
+namespace c11log {
+namespace details {
+class file_flush_helper {
+public:
+    explicit file_flush_helper(std::size_t flush_every): _flush_every(flush_every), _write_counter(0) {};
+
+    void write(std::ofstream& ofs, const std::string& msg) {
+        ofs << msg;
+        if(++_write_counter >= _flush_every) {
+            ofs.flush();
+            _write_counter = 0;
+        }
+    }
+
+private:
+    std::size_t _flush_every;
+    std::size_t _write_counter;
+};
+}
+}
+
diff --git a/include/c11log/sinks/file_sinks.h b/include/c11log/sinks/file_sinks.h
index 3ead8918..63d16cb4 100644
--- a/include/c11log/sinks/file_sinks.h
+++ b/include/c11log/sinks/file_sinks.h
@@ -3,46 +3,48 @@
 #include <fstream>
 #include  <iomanip>
 #include <mutex>
-
 #include "base_sink.h"
+#include "../details/flush_helper.h"
 
 namespace c11log {
 namespace sinks {
+
 /*
 * Trivial file sink with single file as target
 */
 class simple_file_sink : public base_sink {
 public:
-    explicit simple_file_sink(const std::string &filename, const std::string& extension = "txt")
+    explicit simple_file_sink(const std::string &filename, const std::string& extension, size_t flush_after=1)
         : _mutex(),
-          _ofstream(filename + "." + extension, std::ofstream::app) {
+          _ofstream(filename + "." + extension, std::ofstream::app),
+          _flush_helper(flush_after) {
     }
 protected:
     void _sink_it(const std::string& msg) override {
         std::lock_guard<std::mutex> lock(_mutex);
-        _ofstream << msg;
-        _ofstream.flush();
+        _flush_helper.write(_ofstream, msg);
     }
 private:
     std::mutex _mutex;
     std::ofstream _ofstream;
+    details::file_flush_helper _flush_helper;
 };
 
 
-
 /*
  * Thread safe, size limited file sink
 */
 class rotating_file_sink : public base_sink {
 public:
-    rotating_file_sink(const std::string &base_filename, const std::string &extension, size_t max_size, size_t max_files):
+    rotating_file_sink(const std::string &base_filename, const std::string &extension, size_t max_size, size_t max_files, size_t flush_after=1):
         _base_filename(base_filename),
         _extension(extension),
         _max_size(max_size),
         _max_files(max_files),
         _current_size(0),
         _mutex(),
-        _ofstream(_calc_filename(_base_filename, 0, _extension)) {
+        _ofstream(_calc_filename(_base_filename, 0, _extension)),
+        _flush_helper(flush_after) {
     }
 
 protected:
@@ -53,8 +55,7 @@ protected:
             _rotate();
             _current_size = msg.length();
         }
-        _ofstream << msg;
-        _ofstream.flush();
+        _flush_helper.write(_ofstream, msg);
     }
 
 
@@ -93,6 +94,7 @@ private:
     std::size_t _current_size;
     std::mutex _mutex;
     std::ofstream _ofstream;
+    details::file_flush_helper _flush_helper;
 };
 
 /*
@@ -100,12 +102,14 @@ private:
  */
 class daily_file_sink:public base_sink {
 public:
-    explicit daily_file_sink(const std::string& base_filename, const std::string& extension = "txt"):
+    explicit daily_file_sink(const std::string& base_filename, const std::string& extension, size_t flush_after=1):
         _base_filename(base_filename),
         _extension(extension),
         _midnight_tp (_calc_midnight_tp() ),
         _mutex(),
-        _ofstream(_calc_filename(_base_filename, _extension), std::ofstream::app) {
+        _ofstream(_calc_filename(_base_filename, _extension), std::ofstream::app),
+		_flush_helper(flush_after)
+	{
     }
 
 protected:
@@ -116,8 +120,7 @@ protected:
             _ofstream.open(_calc_filename(_base_filename, _extension));
             _midnight_tp = _calc_midnight_tp();
         }
-        _ofstream << msg;
-        _ofstream.flush();
+        _flush_helper.write(_ofstream, msg);
     }
 
 private:
@@ -144,6 +147,7 @@ private:
     std::chrono::system_clock::time_point _midnight_tp;
     std::mutex _mutex;
     std::ofstream _ofstream;
+	details::file_flush_helper _flush_helper;
 
 };
 }