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

worker warmup callback

Browse Source
This commit is contained in:
Denis Ivaykin 2015-01-14 09:21:34 -06:00
parent c3f8200ad5
commit d47fbbb79e
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdlog/async_logger.h
View File

@ -35,6 +35,7 @@
// Upong destruction, logs all remaining messages in the queue before destructing.. // Upong destruction, logs all remaining messages in the queue before destructing..
#include <chrono> #include <chrono>
#include <functional>
#include "common.h" #include "common.h"
#include "logger.h" #include "logger.h"
@ -51,9 +52,9 @@ class async_logger :public logger
{ {
public: public:
template<class It> template<class It>
async_logger(const std::string& name, const It& begin, const It& end, size_t queue_size); async_logger(const std::string& name, const It& begin, const It& end, size_t queue_size, const std::function<void()>& worker_warmup_cb = nullptr);
async_logger(const std::string& logger_name, sinks_init_list sinks, size_t queue_size); async_logger(const std::string& logger_name, sinks_init_list sinks, size_t queue_size, const std::function<void()>& worker_warmup_cb = nullptr);
async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size); async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size, const std::function<void()>& worker_warmup_cb = nullptr);
protected: protected:

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

@ -36,6 +36,7 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <atomic> #include <atomic>
#include <functional>
#include "../common.h" #include "../common.h"
#include "../sinks/sink.h" #include "../sinks/sink.h"
@ -108,7 +109,7 @@ public:
using clock = std::chrono::steady_clock; using clock = std::chrono::steady_clock;
async_log_helper(formatter_ptr formatter, const std::vector<sink_ptr>& sinks, size_t queue_size); async_log_helper(formatter_ptr formatter, const std::vector<sink_ptr>& sinks, size_t queue_size, const std::function<void()>& worker_warmup_cb = nullptr);
void log(const details::log_msg& msg); void log(const details::log_msg& msg);
//Stop logging and join the back thread //Stop logging and join the back thread
@ -124,6 +125,9 @@ private:
// last exception thrown from the worker thread // last exception thrown from the worker thread
std::shared_ptr<spdlog_ex> _last_workerthread_ex; std::shared_ptr<spdlog_ex> _last_workerthread_ex;
// worker thread warmup callback - one can set thread priority, affinity, etc
const std::function<void()> _worker_warmup_cb;
// throw last worker thread exception or if worker thread is not active // throw last worker thread exception or if worker thread is not active
@ -136,7 +140,7 @@ private:
//return true if a message was available (queue was not empty), will set the last_pop to the pop time //return true if a message was available (queue was not empty), will set the last_pop to the pop time
bool process_next_msg(clock::time_point& last_pop); bool process_next_msg(clock::time_point& last_pop);
// guess how much to sleep if queue is empty/full using last succesful op time as hint // guess how much to sleep if queue is empty/full using last successful op time as hint
static void sleep_or_yield(const clock::time_point& last_op_time); static void sleep_or_yield(const clock::time_point& last_op_time);
}; };
@ -146,10 +150,11 @@ private:
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// async_sink class implementation // async_sink class implementation
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
inline spdlog::details::async_log_helper::async_log_helper(formatter_ptr formatter, const std::vector<sink_ptr>& sinks, size_t queue_size): inline spdlog::details::async_log_helper::async_log_helper(formatter_ptr formatter, const std::vector<sink_ptr>& sinks, size_t queue_size, const std::function<void()>& worker_warmup_cb):
_formatter(formatter), _formatter(formatter),
_sinks(sinks), _sinks(sinks),
_q(queue_size), _q(queue_size),
_worker_warmup_cb(worker_warmup_cb),
_worker_thread(&async_log_helper::worker_loop, this) _worker_thread(&async_log_helper::worker_loop, this)
{} {}
@ -189,6 +194,7 @@ inline void spdlog::details::async_log_helper::worker_loop()
{ {
try try
{ {
if (_worker_warmup_cb) _worker_warmup_cb();
clock::time_point last_pop = clock::now(); clock::time_point last_pop = clock::now();
while(process_next_msg(last_pop)); while(process_next_msg(last_pop));
} }

12
include/spdlog/details/async_logger_impl.h
View File

@ -34,17 +34,17 @@
template<class It> template<class It>
inline spdlog::async_logger::async_logger(const std::string& logger_name, const It& begin, const It& end, size_t queue_size) : inline spdlog::async_logger::async_logger(const std::string& logger_name, const It& begin, const It& end, size_t queue_size, const std::function<void()>& worker_warmup_cb) :
logger(logger_name, begin, end), logger(logger_name, begin, end),
_async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size)) _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, worker_warmup_cb))
{ {
} }
inline spdlog::async_logger::async_logger(const std::string& logger_name, sinks_init_list sinks, size_t queue_size) : inline spdlog::async_logger::async_logger(const std::string& logger_name, sinks_init_list sinks, size_t queue_size, const std::function<void()>& worker_warmup_cb) :
async_logger(logger_name, sinks.begin(), sinks.end(), queue_size) {} async_logger(logger_name, sinks.begin(), sinks.end(), queue_size, worker_warmup_cb) {}
inline spdlog::async_logger::async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size) : inline spdlog::async_logger::async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size, const std::function<void()>& worker_warmup_cb) :
async_logger(logger_name, { single_sink }, queue_size) {} async_logger(logger_name, { single_sink }, queue_size, worker_warmup_cb) {}
inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_formatter) inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_formatter)

7
include/spdlog/details/registry.h
View File

@ -31,6 +31,7 @@
#include <string> #include <string>
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
#include <functional>
#include "../logger.h" #include "../logger.h"
#include "../async_logger.h" #include "../async_logger.h"
@ -61,7 +62,7 @@ public:
return found->second; return found->second;
std::shared_ptr<logger> new_logger; std::shared_ptr<logger> new_logger;
if (_async_mode) if (_async_mode)
new_logger = std::make_shared<async_logger>(logger_name, sinks_begin, sinks_end, _async_q_size); new_logger = std::make_shared<async_logger>(logger_name, sinks_begin, sinks_end, _async_q_size, _worker_warmup_cb);
else else
new_logger = std::make_shared<logger>(logger_name, sinks_begin, sinks_end); new_logger = std::make_shared<logger>(logger_name, sinks_begin, sinks_end);
@ -119,11 +120,12 @@ public:
l.second->set_level(log_level); l.second->set_level(log_level);
} }
void set_async_mode(size_t q_size) void set_async_mode(size_t q_size, const std::function<void()>& worker_warmup_cb = nullptr)
{ {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
_async_mode = true; _async_mode = true;
_async_q_size = q_size; _async_q_size = q_size;
_worker_warmup_cb = worker_warmup_cb;
} }
void set_sync_mode() void set_sync_mode()
@ -149,6 +151,7 @@ private:
level::level_enum _level = level::info; level::level_enum _level = level::info;
bool _async_mode = false; bool _async_mode = false;
size_t _async_q_size = 0; size_t _async_q_size = 0;
std::function<void()> _worker_warmup_cb = nullptr;
}; };
} }
} }

4
include/spdlog/details/spdlog_impl.h
View File

@ -132,9 +132,9 @@ inline void spdlog::set_level(level::level_enum log_level)
} }
inline void spdlog::set_async_mode(size_t queue_size) inline void spdlog::set_async_mode(size_t queue_size, const std::function<void()>& worker_warmup_cb)
{ {
details::registry::instance().set_async_mode(queue_size); details::registry::instance().set_async_mode(queue_size, worker_warmup_cb);
} }
inline void spdlog::set_sync_mode() inline void spdlog::set_sync_mode()

2
include/spdlog/spdlog.h
View File

@ -63,7 +63,7 @@ void set_level(level::level_enum log_level);
// Turn on async mode and set the queue size for each async_logger // Turn on async mode and set the queue size for each async_logger
void set_async_mode(size_t queue_size); void set_async_mode(size_t queue_size, const std::function<void()>& worker_warmup_cb);
// Turn off async mode // Turn off async mode
void set_sync_mode(); void set_sync_mode();