Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-29 01:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

move log_msg to details namespace

Browse Source
This commit is contained in:
gabime
2014-03-28 19:03:24 +03:00
parent 40acfdfbc2
commit c09df09b9c
10 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/c11log/sinks/async_sink.h
View File

@@ -7,7 +7,10 @@
#include "base_sink.h"
#include "../logger.h"
#include "../details/blocking_queue.h"
#include "../details/log_msg.h"
using namespace std;
namespace c11log
{
namespace sinks
@@ -16,7 +19,9 @@ namespace sinks
class async_sink : public base_sink
{
public:
using size_type = c11log::details::blocking_queue<std::string>::size_type;
using queue_t = c11log::details::blocking_queue<std::shared_ptr<details::log_msg>>;
using size_type = queue_t::size_type;
explicit async_sink(const size_type max_queue_size);
~async_sink();
@@ -28,13 +33,13 @@ public:
protected:
void _sink_it(const bufpair_t& msg) override;
void _sink_it(const details::log_msg& msg) override;
void _thread_loop();
private:
c11log::logger::sinks_vector_t _sinks;
std::atomic<bool> _active;
c11log::details::blocking_queue<std::string> _q;
queue_t _q;
std::thread _back_thread;
//Clear all remaining messages(if any), stop the _back_thread and join it
void _shutdown();
@@ -46,7 +51,7 @@ private:
// async_sink class implementation
///////////////////////////////////////////////////////////////////////////////
inline c11log::sinks::async_sink::async_sink(const std::size_t max_queue_size)
inline c11log::sinks::async_sink::async_sink(const size_type max_queue_size)
:_sinks(),
_active(true),
_q(max_queue_size),
@@ -57,27 +62,33 @@ inline c11log::sinks::async_sink::~async_sink()
{
_shutdown();
}
inline void c11log::sinks::async_sink::_sink_it(const bufpair_t& msg)
inline void c11log::sinks::async_sink::_sink_it(const details::log_msg& msg)
{
std::string s {msg.first, msg.first+msg.second};
_q.push(s);
//re allocate on the heap the (stack based) message
auto new_msg = new details::log_msg();
*new_msg = msg;
auto msg_size = msg.msg_buf.second;
char *buf = new char[msg_size];
std::memcpy(buf, msg.msg_buf.first, msg_size);
new_msg->msg_buf = bufpair_t(buf, msg_size);
auto new_shared = std::shared_ptr<details::log_msg>(new_msg, [](details::log_msg* msg_to_delete)
{
delete []msg_to_delete->msg_buf.first;
});
_q.push(new_shared);
}
inline void c11log::sinks::async_sink::_thread_loop()
{
static std::chrono::seconds pop_timeout { 1 };
std::string msg;
while (_active)
{
std::shared_ptr<details::log_msg> msg;
if (_q.pop(msg, pop_timeout))
{
bufpair_t buf(msg.data(), msg.size());
for (auto &sink : _sinks)
{
sink->log(buf, level::INFO);
if (!_active)
return;
sink->log(*msg);
}
}
}