Commit 6f4c7800 authored by gabime's avatar gabime

flush_helper

parent 005dc7e6
...@@ -60,12 +60,12 @@ int main(int argc, char* argv[]) ...@@ -60,12 +60,12 @@ int main(int argc, char* argv[])
auto null_sink = std::make_shared<sinks::null_sink>(); auto null_sink = std::make_shared<sinks::null_sink>();
auto stdout_sink = std::make_shared<sinks::stdout_sink>(); auto stdout_sink = std::make_shared<sinks::stdout_sink>();
auto async = std::make_shared<sinks::async_sink>(qsize); 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); async->add_sink(fsink);
auto &logger = c11log::get_logger("async"); auto &logger = c11log::get_logger("async");
logger.add_sink(async); logger.add_sink(fsink);
testlog(threads); testlog(threads);
} }
......
#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;
};
}
}
...@@ -3,46 +3,48 @@ ...@@ -3,46 +3,48 @@
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <mutex> #include <mutex>
#include "base_sink.h" #include "base_sink.h"
#include "../details/flush_helper.h"
namespace c11log { namespace c11log {
namespace sinks { namespace sinks {
/* /*
* Trivial file sink with single file as target * Trivial file sink with single file as target
*/ */
class simple_file_sink : public base_sink { class simple_file_sink : public base_sink {
public: 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(), : _mutex(),
_ofstream(filename + "." + extension, std::ofstream::app) { _ofstream(filename + "." + extension, std::ofstream::app),
_flush_helper(flush_after) {
} }
protected: protected:
void _sink_it(const std::string& msg) override { void _sink_it(const std::string& msg) override {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
_ofstream << msg; _flush_helper.write(_ofstream, msg);
_ofstream.flush();
} }
private: private:
std::mutex _mutex; std::mutex _mutex;
std::ofstream _ofstream; std::ofstream _ofstream;
details::file_flush_helper _flush_helper;
}; };
/* /*
* Thread safe, size limited file sink * Thread safe, size limited file sink
*/ */
class rotating_file_sink : public base_sink { class rotating_file_sink : public base_sink {
public: 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), _base_filename(base_filename),
_extension(extension), _extension(extension),
_max_size(max_size), _max_size(max_size),
_max_files(max_files), _max_files(max_files),
_current_size(0), _current_size(0),
_mutex(), _mutex(),
_ofstream(_calc_filename(_base_filename, 0, _extension)) { _ofstream(_calc_filename(_base_filename, 0, _extension)),
_flush_helper(flush_after) {
} }
protected: protected:
...@@ -53,8 +55,7 @@ protected: ...@@ -53,8 +55,7 @@ protected:
_rotate(); _rotate();
_current_size = msg.length(); _current_size = msg.length();
} }
_ofstream << msg; _flush_helper.write(_ofstream, msg);
_ofstream.flush();
} }
...@@ -93,6 +94,7 @@ private: ...@@ -93,6 +94,7 @@ private:
std::size_t _current_size; std::size_t _current_size;
std::mutex _mutex; std::mutex _mutex;
std::ofstream _ofstream; std::ofstream _ofstream;
details::file_flush_helper _flush_helper;
}; };
/* /*
...@@ -100,12 +102,14 @@ private: ...@@ -100,12 +102,14 @@ private:
*/ */
class daily_file_sink:public base_sink { class daily_file_sink:public base_sink {
public: 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), _base_filename(base_filename),
_extension(extension), _extension(extension),
_midnight_tp (_calc_midnight_tp() ), _midnight_tp (_calc_midnight_tp() ),
_mutex(), _mutex(),
_ofstream(_calc_filename(_base_filename, _extension), std::ofstream::app) { _ofstream(_calc_filename(_base_filename, _extension), std::ofstream::app),
_flush_helper(flush_after)
{
} }
protected: protected:
...@@ -116,8 +120,7 @@ protected: ...@@ -116,8 +120,7 @@ protected:
_ofstream.open(_calc_filename(_base_filename, _extension)); _ofstream.open(_calc_filename(_base_filename, _extension));
_midnight_tp = _calc_midnight_tp(); _midnight_tp = _calc_midnight_tp();
} }
_ofstream << msg; _flush_helper.write(_ofstream, msg);
_ofstream.flush();
} }
private: private:
...@@ -144,6 +147,7 @@ private: ...@@ -144,6 +147,7 @@ private:
std::chrono::system_clock::time_point _midnight_tp; std::chrono::system_clock::time_point _midnight_tp;
std::mutex _mutex; std::mutex _mutex;
std::ofstream _ofstream; std::ofstream _ofstream;
details::file_flush_helper _flush_helper;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment