returned fast_oss with optimizations

This commit is contained in:
gabime
2014-03-07 00:52:50 +02:00
parent 63812d7a03
commit c9dd1169f2
16 changed files with 117 additions and 85 deletions

View File

@@ -8,10 +8,13 @@
#include "../logger.h"
#include "../details/blocking_queue.h"
namespace c11log {
namespace sinks {
namespace c11log
{
namespace sinks
{
class async_sink : public base_sink {
class async_sink : public base_sink
{
public:
using size_type = c11log::details::blocking_queue<std::string>::size_type;

View File

@@ -6,9 +6,12 @@
#include "../formatter.h"
#include "../common_types.h"
namespace c11log {
namespace sinks {
class base_sink {
namespace c11log
{
namespace sinks
{
class base_sink
{
public:
base_sink() = default;
base_sink(level::level_enum l):_level(l) {
@@ -33,7 +36,8 @@ protected:
std::atomic<int> _level {level::INFO};
};
class null_sink:public base_sink {
class null_sink:public base_sink
{
protected:
void _sink_it(const std::string& ) override {
}

View File

@@ -6,13 +6,16 @@
#include "base_sink.h"
#include "../details/flush_helper.h"
namespace c11log {
namespace sinks {
namespace c11log
{
namespace sinks
{
/*
* Trivial file sink with single file as target
*/
class simple_file_sink : public base_sink {
class simple_file_sink : public base_sink
{
public:
explicit simple_file_sink(const std::string &filename,
const std::string& extension,
@@ -36,7 +39,8 @@ private:
/*
* Thread safe, size limited file sink
*/
class rotating_file_sink : public base_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,
@@ -104,7 +108,8 @@ private:
/*
* Thread safe file sink that closes the log file at midnight and opens new one
*/
class daily_file_sink:public base_sink {
class daily_file_sink:public base_sink
{
public:
explicit daily_file_sink(const std::string& base_filename,
const std::string& extension,
@@ -140,14 +145,14 @@ private:
return system_clock::time_point(midnight + hours(24));
}
//Create filename for the form basename.YYYY-MM-DD.extension
//Create filename for the form basename.YYYY-MM-DD.extension
static std::string _calc_filename(const std::string& basename, const std::string& extension) {
std::tm tm = c11log::details::os::localtime();
std::ostringstream oss;
oss << basename << '.';
oss << tm.tm_year + 1900 << '-' << std::setw(2) << std::setfill('0') << tm.tm_mon + 1 << '-' << tm.tm_mday;
oss << '.' << extension;
return oss.str();
std::tm tm = c11log::details::os::localtime();
std::ostringstream oss;
oss << basename << '.';
oss << tm.tm_year + 1900 << '-' << std::setw(2) << std::setfill('0') << tm.tm_mon + 1 << '-' << tm.tm_mday;
oss << '.' << extension;
return oss.str();
}
std::string _base_filename;

View File

@@ -6,23 +6,26 @@
#include "base_sink.h"
namespace c11log {
namespace sinks {
class ostream_sink: public base_sink {
namespace c11log
{
namespace sinks
{
class ostream_sink: public base_sink
{
public:
explicit ostream_sink(std::ostream& os):_ostream(os) {}
ostream_sink(const ostream_sink&) = delete;
ostream_sink& operator=(const ostream_sink&) = delete;
ostream_sink(const ostream_sink&) = delete;
ostream_sink& operator=(const ostream_sink&) = delete;
virtual ~ostream_sink() = default;
protected:
virtual void _sink_it(const std::string& msg) override {
std::lock_guard<std::mutex> lock(_mutex);
std::lock_guard<std::mutex> lock(_mutex);
_ostream << msg;
}
std::ostream& _ostream;
std::mutex _mutex;
std::mutex _mutex;
};