removed un needed mutex, and added copy ctors to line logger and friends

This commit is contained in:
gabime
2014-02-09 01:25:23 +02:00
parent 514526ed7a
commit d60e971dec
9 changed files with 210 additions and 208 deletions

View File

@@ -19,5 +19,6 @@ c11log::details::factory::logger_ptr c11log::details::factory::get_logger(const
c11log::details::factory & c11log::details::factory::instance()
{
static c11log::details::factory instance;
return instance;
}

View File

@@ -1,21 +0,0 @@
#include "stdafx.h"
#include "c11log/logger.h"
c11log::details::line_logger::line_logger(logger* callback_logger, level::level_enum msg_level) :
_callback_logger(callback_logger)
{
if (callback_logger) {
callback_logger->formatter_->format_header(callback_logger->logger_name_,
msg_level,
c11log::formatters::clock::now(),
_oss);
}
}
c11log::details::line_logger::~line_logger()
{
if (_callback_logger) {
_oss << '\n';
_callback_logger->log_it_(_oss.str_ref());
}
}

View File

@@ -20,38 +20,37 @@ using std::string;
using std::chrono::seconds;
using Q = c11log::details::blocking_queue<string>;
void pusher(Q* q)
void pusher(Q* )
{
auto &logger = c11log::get_logger("async");
while(active)
{
logger.info()<<"Hello logger!";
++push_count;
++push_count;
}
}
void testq(int size, int pushers, int poppers)
{
active = true;
Q q{static_cast<Q::size_type>(size)};
active = true;
Q q{static_cast<Q::size_type>(size)};
/*
for(int i = 0; i < poppers; i++)
testq(qsize, pushers, poppers);
*/
*/
for(int i = 0; i < pushers; i++)
new std::thread(std::bind(pusher, &q));
while(active)
{
using std::endl;
using std::cout;
using utils::format;
push_count = 0;
pop_count = 0;
std::this_thread::sleep_for(seconds(1));
@@ -59,8 +58,8 @@ void testq(int size, int pushers, int poppers)
//cout << "Pops/sec =\t" << format(pop_count.load()) << endl << endl;
//cout << "Total/sec =\t" << format(push_count+pop_count) << endl;
cout << "Queue size =\t" << format(q.size()) << endl;
cout << "---------------------------------------------------------------------" << endl;
}
cout << "---------------------------------------------------------------------" << endl;
}
}
@@ -75,26 +74,24 @@ int main(int argc, char* argv[])
int qsize = atoi(argv[1]);
int pushers = atoi(argv[2]);
int poppers = atoi(argv[3]);
//testq(qsize, pushers, poppers);
using namespace std::chrono;
auto null_sink = std::make_shared<c11log::sinks::null_sink>();
auto stdout_sink = std::make_shared<c11log::sinks::stdout_sink>();
auto async = std::make_shared<c11log::sinks::async_sink>(1000);
auto fsink = std::make_shared<c11log::sinks::rotating_file_sink>("newlog", "txt", 1024*1024*10 , 2);
//auto fsink = std::make_shared<c11log::sinks::daily_file_sink>("daily", "txt");
async->add_sink(fsink);
async->add_sink(null_sink);
auto &logger = c11log::get_logger("async");
logger.add_sink(async);
testq(qsize, pushers, poppers);
}