mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-26 10:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handling of empty queue

Browse Source
This commit is contained in:
gabi 2014-12-02 19:14:21 +02:00
parent 243dc61e58
commit b943265b94
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/spdlog/details/async_log_helper.h
View File

@ -87,6 +87,8 @@ class async_log_helper
public: public:
using q_type = details::mpsc_q < std::unique_ptr<async_msg> >; using q_type = details::mpsc_q < std::unique_ptr<async_msg> >;
using clock = std::chrono::monotonic_clock;
explicit async_log_helper(size_t max_queue_size); explicit async_log_helper(size_t max_queue_size);
void log(const details::log_msg& msg); void log(const details::log_msg& msg);
@ -116,12 +118,17 @@ private:
// worker thread formatter // worker thread formatter
formatter_ptr _formatter; formatter_ptr _formatter;
// will throw last back thread exception or if worker hread no active // will throw last back thread exception or if worker hread no active
void _push_sentry(); void _push_sentry();
// worker thread loop // worker thread loop
void _thread_loop(); void _thread_loop();
// guess how much to sleep if queue is empty
static clock::duration spdlog::details::async_log_helper::_calc_pop_sleep(const clock::time_point& last_pop);
// clear all remaining messages(if any), stop the _worker_thread and join it // clear all remaining messages(if any), stop the _worker_thread and join it
void _join(); void _join();
@ -154,15 +161,18 @@ inline void spdlog::details::async_log_helper::log(const details::log_msg& msg)
inline void spdlog::details::async_log_helper::_thread_loop() inline void spdlog::details::async_log_helper::_thread_loop()
{ {
clock::time_point last_pop = clock::now();
while (_active) while (_active)
{ {
q_type::item_type async_msg; q_type::item_type async_msg;
if (_q.pop(async_msg)) if (_q.pop(async_msg))
{ {
last_pop = clock::now();
try try
{ {
details::log_msg log_msg = async_msg->to_log_msg(); details::log_msg log_msg = async_msg->to_log_msg();
_formatter->format(log_msg); _formatter->format(log_msg);
@ -179,13 +189,31 @@ inline void spdlog::details::async_log_helper::_thread_loop()
_last_workerthread_ex = std::make_shared<spdlog_ex>("Unknown exception"); _last_workerthread_ex = std::make_shared<spdlog_ex>("Unknown exception");
} }
} }
else //Sleep and retry if empty //Sleep for a while if empty.
else
{ {
std::this_thread::sleep_for(std::chrono::microseconds(100)); std::this_thread::sleep_for(_calc_pop_sleep(last_pop));
} }
} }
} }
//Try to guess sleep duration according to the time passed since last message
inline spdlog::details::async_log_helper::clock::duration spdlog::details::async_log_helper::_calc_pop_sleep(const clock::time_point& last_pop)
{
using std::chrono::milliseconds;
using std::chrono::microseconds;
auto time_since_pop = clock::now() - last_pop;
if (time_since_pop > milliseconds(1000))
return milliseconds(500);
if (time_since_pop > microseconds(0))
return(time_since_pop / 2);
return microseconds(0);
}
inline void spdlog::details::async_log_helper::add_sink(spdlog::sink_ptr s) inline void spdlog::details::async_log_helper::add_sink(spdlog::sink_ptr s)
{ {
std::lock_guard<std::mutex> guard(_mutex); std::lock_guard<std::mutex> guard(_mutex);