TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support for source location in async loggers

This commit is contained in:
gabime 2018-11-22 19:17:41 +02:00
parent a463989278
commit 521b0733d4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/spdlog/common.h
View File

@ -197,8 +197,13 @@ struct source_loc
, line(line) , line(line)
{ {
} }
const char *const filename; //
const uint32_t line; // source_loc (const source_loc&) = default;
// source_loc& operator=(const source_loc&) = default;
// source_loc& operator=(source_loc&&) = default;
const char *filename;
uint32_t line;
}; };
namespace details { namespace details {

6
include/spdlog/details/thread_pool.h
View File

@ -33,6 +33,7 @@ struct async_msg
fmt::basic_memory_buffer<char, 176> raw; fmt::basic_memory_buffer<char, 176> raw;
size_t msg_id; size_t msg_id;
source_loc source;
async_logger_ptr worker_ptr; async_logger_ptr worker_ptr;
async_msg() = default; async_msg() = default;
@ -49,6 +50,7 @@ struct async_msg
thread_id(other.thread_id), thread_id(other.thread_id),
raw(move(other.raw)), raw(move(other.raw)),
msg_id(other.msg_id), msg_id(other.msg_id),
source(other.source),
worker_ptr(std::move(other.worker_ptr)) worker_ptr(std::move(other.worker_ptr))
{ {
} }
@ -61,6 +63,7 @@ struct async_msg
thread_id = other.thread_id; thread_id = other.thread_id;
raw = std::move(other.raw); raw = std::move(other.raw);
msg_id = other.msg_id; msg_id = other.msg_id;
source = other.source;
worker_ptr = std::move(other.worker_ptr); worker_ptr = std::move(other.worker_ptr);
return *this; return *this;
} }
@ -76,6 +79,7 @@ struct async_msg
, time(m.time) , time(m.time)
, thread_id(m.thread_id) , thread_id(m.thread_id)
, msg_id(m.msg_id) , msg_id(m.msg_id)
, source(m.source)
, worker_ptr(std::move(worker)) , worker_ptr(std::move(worker))
{ {
fmt_helper::append_string_view(m.payload, raw); fmt_helper::append_string_view(m.payload, raw);
@ -87,6 +91,7 @@ struct async_msg
, time() , time()
, thread_id(0) , thread_id(0)
, msg_id(0) , msg_id(0)
, source()
, worker_ptr(std::move(worker)) , worker_ptr(std::move(worker))
{ {
} }
@ -103,6 +108,7 @@ struct async_msg
msg.time = time; msg.time = time;
msg.thread_id = thread_id; msg.thread_id = thread_id;
msg.msg_id = msg_id; msg.msg_id = msg_id;
msg.source = source;
msg.color_range_start = 0; msg.color_range_start = 0;
msg.color_range_end = 0; msg.color_range_end = 0;
return msg; return msg;