From f3a417485381de499dbf872c6bf9fa10faa056f1 Mon Sep 17 00:00:00 2001 From: gabime Date: Thu, 15 Jan 2015 10:49:05 +0200 Subject: [PATCH] astyle.sh --- example/example.cpp | 2 +- include/spdlog/async_logger.h | 32 ++++++++++---------- include/spdlog/details/async_log_helper.h | 22 +++++++------- include/spdlog/details/async_logger_impl.h | 34 +++++++++++----------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/example/example.cpp b/example/example.cpp index 89bd3388..312ee57f 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -66,7 +66,7 @@ int main(int, char* []) SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23); SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23); - + // Asynchronous logging is very fast.. // Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous.. size_t q_size = 1048576; //queue size must be power of 2 diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h index c73daee7..7bcde900 100644 --- a/include/spdlog/async_logger.h +++ b/include/spdlog/async_logger.h @@ -53,24 +53,24 @@ class async_logger :public logger { public: template - async_logger(const std::string& name, - const It& begin, - const It& end, - size_t queue_size, - const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, - const std::function& worker_warmup_cb = nullptr); - + async_logger(const std::string& name, + const It& begin, + const It& end, + size_t queue_size, + const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, + const std::function& worker_warmup_cb = nullptr); + async_logger(const std::string& logger_name, - sinks_init_list sinks, - size_t queue_size, - const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, - const std::function& worker_warmup_cb = nullptr); - + sinks_init_list sinks, + size_t queue_size, + const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, + const std::function& worker_warmup_cb = nullptr); + async_logger(const std::string& logger_name, - sink_ptr single_sink, - size_t queue_size, - const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, - const std::function& worker_warmup_cb = nullptr); + sink_ptr single_sink, + size_t queue_size, + const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, + const std::function& worker_warmup_cb = nullptr); protected: diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h index a77543fa..8c04711f 100644 --- a/include/spdlog/details/async_log_helper.h +++ b/include/spdlog/details/async_log_helper.h @@ -110,11 +110,11 @@ public: async_log_helper(formatter_ptr formatter, - const std::vector& sinks, - size_t queue_size, - const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, - const std::function& worker_warmup_cb = nullptr); - + const std::vector& sinks, + size_t queue_size, + const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, + const std::function& worker_warmup_cb = nullptr); + void log(const details::log_msg& msg); //Stop logging and join the back thread @@ -125,10 +125,10 @@ public: private: formatter_ptr _formatter; std::vector> _sinks; - + // queue of messages to log q_type _q; - + // last exception thrown from the worker thread std::shared_ptr _last_workerthread_ex; @@ -137,10 +137,10 @@ private: // worker thread warmup callback - one can set thread priority, affinity, etc const std::function _worker_warmup_cb; - - // worker thread - std::thread _worker_thread; - + + // worker thread + std::thread _worker_thread; + // throw last worker thread exception or if worker thread is not active void throw_if_bad_worker(); diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index 0665a330..e113e1d2 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -35,29 +35,29 @@ template inline spdlog::async_logger::async_logger(const std::string& logger_name, - const It& begin, - const It& end, - size_t queue_size, - const async_overflow_policy overflow_policy, - const std::function& worker_warmup_cb) : - logger(logger_name, begin, end), - _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, overflow_policy, worker_warmup_cb)) + const It& begin, + const It& end, + size_t queue_size, + const async_overflow_policy overflow_policy, + const std::function& worker_warmup_cb) : + logger(logger_name, begin, end), + _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, overflow_policy, worker_warmup_cb)) { } inline spdlog::async_logger::async_logger(const std::string& logger_name, - sinks_init_list sinks, - size_t queue_size, - const async_overflow_policy overflow_policy, - const std::function& worker_warmup_cb) : - async_logger(logger_name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb) {} + sinks_init_list sinks, + size_t queue_size, + const async_overflow_policy overflow_policy, + const std::function& worker_warmup_cb) : + async_logger(logger_name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb) {} inline spdlog::async_logger::async_logger(const std::string& logger_name, - sink_ptr single_sink, - size_t queue_size, - const async_overflow_policy overflow_policy, - const std::function& worker_warmup_cb) : - async_logger(logger_name, { single_sink }, queue_size, overflow_policy, worker_warmup_cb) {} + sink_ptr single_sink, + size_t queue_size, + const async_overflow_policy overflow_policy, + const std::function& worker_warmup_cb) : + async_logger(logger_name, { single_sink }, queue_size, overflow_policy, worker_warmup_cb) {} inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_formatter)