From 9716ff69c4037bd758dedf6755590d2212599c4d Mon Sep 17 00:00:00 2001 From: gabime Date: Sat, 6 Apr 2019 01:31:10 +0300 Subject: [PATCH] added inline statemetns --- src/pattern_formatter.cpp | 16 ++++++------- src/registry.cpp | 48 +++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/pattern_formatter.cpp b/src/pattern_formatter.cpp index b3037480..810d8a23 100644 --- a/src/pattern_formatter.cpp +++ b/src/pattern_formatter.cpp @@ -960,7 +960,7 @@ private: } // namespace details - pattern_formatter::pattern_formatter( + SPDLOG_INLINE pattern_formatter::pattern_formatter( std::string pattern, pattern_time_type time_type, std::string eol) : pattern_(std::move(pattern)) , eol_(std::move(eol)) @@ -972,7 +972,7 @@ private: } // use by default full formatter for if pattern is not given - pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) + SPDLOG_INLINE pattern_formatter::pattern_formatter(pattern_time_type time_type, std::string eol) : pattern_("%+") , eol_(std::move(eol)) , pattern_time_type_(time_type) @@ -983,12 +983,12 @@ private: } - std::unique_ptr pattern_formatter::clone() const + SPDLOG_INLINE std::unique_ptr pattern_formatter::clone() const { return details::make_unique(pattern_, pattern_time_type_, eol_); } - void pattern_formatter::format(const details::log_msg &msg, fmt::memory_buffer &dest) + SPDLOG_INLINE void pattern_formatter::format(const details::log_msg &msg, fmt::memory_buffer &dest) { #ifndef SPDLOG_NO_DATETIME auto secs = std::chrono::duration_cast(msg.time.time_since_epoch()); @@ -1006,7 +1006,7 @@ private: details::fmt_helper::append_string_view(eol_, dest); } - std::tm pattern_formatter::get_time_(const details::log_msg &msg) + SPDLOG_INLINE std::tm pattern_formatter::get_time_(const details::log_msg &msg) { if (pattern_time_type_ == pattern_time_type::local) { @@ -1015,7 +1015,7 @@ private: return details::os::gmtime(log_clock::to_time_t(msg.time)); } - void pattern_formatter::handle_flag_(char flag, details::padding_info padding) + SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_info padding) { switch (flag) { @@ -1183,7 +1183,7 @@ private: // Extract given pad spec (e.g. %8X) // Advance the given it pass the end of the padding spec found (if any) // Return padding. - details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) + SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) { using details::padding_info; using details::scoped_pad; @@ -1223,7 +1223,7 @@ private: return details::padding_info{std::min(width, max_width), side}; } - void pattern_formatter::compile_pattern_(const std::string &pattern) + SPDLOG_INLINE void pattern_formatter::compile_pattern_(const std::string &pattern) { auto end = pattern.end(); std::unique_ptr user_chars; diff --git a/src/registry.cpp b/src/registry.cpp index 51f184ed..b4487b4a 100644 --- a/src/registry.cpp +++ b/src/registry.cpp @@ -30,7 +30,7 @@ namespace spdlog { namespace details { -registry::registry() +SPDLOG_INLINE registry::registry() : formatter_(new pattern_formatter()) , level_(spdlog::logger::default_level()) { @@ -49,13 +49,13 @@ registry::registry() #endif // SPDLOG_DISABLE_DEFAULT_LOGGER } -void registry::register_logger(std::shared_ptr new_logger) +SPDLOG_INLINE void registry::register_logger(std::shared_ptr new_logger) { std::lock_guard lock(logger_map_mutex_); register_logger_(std::move(new_logger)); } -void registry::initialize_logger(std::shared_ptr new_logger) +SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr new_logger) { std::lock_guard lock(logger_map_mutex_); new_logger->set_formatter(formatter_->clone()); @@ -74,14 +74,14 @@ void registry::initialize_logger(std::shared_ptr new_logger) } } -std::shared_ptr registry::get(const std::string &logger_name) +SPDLOG_INLINE std::shared_ptr registry::get(const std::string &logger_name) { std::lock_guard lock(logger_map_mutex_); auto found = loggers_.find(logger_name); return found == loggers_.end() ? nullptr : found->second; } -std::shared_ptr registry::default_logger() +SPDLOG_INLINE std::shared_ptr registry::default_logger() { std::lock_guard lock(logger_map_mutex_); return default_logger_; @@ -91,14 +91,14 @@ std::shared_ptr registry::default_logger() // To be used directly by the spdlog default api (e.g. spdlog::info) // This make the default API faster, but cannot be used concurrently with set_default_logger(). // e.g do not call set_default_logger() from one thread while calling spdlog::info() from another. -logger *registry::get_default_raw() +SPDLOG_INLINE logger *registry::get_default_raw() { return default_logger_.get(); } // set default logger. // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map. -void registry::set_default_logger(std::shared_ptr new_default_logger) +SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr new_default_logger) { std::lock_guard lock(logger_map_mutex_); // remove previous default logger from the map @@ -113,20 +113,20 @@ void registry::set_default_logger(std::shared_ptr new_default_logger) default_logger_ = std::move(new_default_logger); } -void registry::set_tp(std::shared_ptr tp) +SPDLOG_INLINE void registry::set_tp(std::shared_ptr tp) { std::lock_guard lock(tp_mutex_); tp_ = std::move(tp); } -std::shared_ptr registry::get_tp() +SPDLOG_INLINE std::shared_ptr registry::get_tp() { std::lock_guard lock(tp_mutex_); return tp_; } // Set global formatter. Each sink in each logger will get a clone of this object -void registry::set_formatter(std::unique_ptr formatter) +SPDLOG_INLINE void registry::set_formatter(std::unique_ptr formatter) { std::lock_guard lock(logger_map_mutex_); formatter_ = std::move(formatter); @@ -136,7 +136,7 @@ void registry::set_formatter(std::unique_ptr formatter) } } -void registry::set_level(level::level_enum log_level) +SPDLOG_INLINE void registry::set_level(level::level_enum log_level) { std::lock_guard lock(logger_map_mutex_); for (auto &l : loggers_) @@ -146,7 +146,7 @@ void registry::set_level(level::level_enum log_level) level_ = log_level; } -void registry::flush_on(level::level_enum log_level) +SPDLOG_INLINE void registry::flush_on(level::level_enum log_level) { std::lock_guard lock(logger_map_mutex_); for (auto &l : loggers_) @@ -156,14 +156,14 @@ void registry::flush_on(level::level_enum log_level) flush_level_ = log_level; } -void registry::flush_every(std::chrono::seconds interval) +SPDLOG_INLINE void registry::flush_every(std::chrono::seconds interval) { std::lock_guard lock(flusher_mutex_); std::function clbk = std::bind(®istry::flush_all, this); periodic_flusher_ = details::make_unique(clbk, interval); } -void registry::set_error_handler(void (*handler)(const std::string &msg)) +SPDLOG_INLINE void registry::set_error_handler(void (*handler)(const std::string &msg)) { std::lock_guard lock(logger_map_mutex_); for (auto &l : loggers_) @@ -173,7 +173,7 @@ void registry::set_error_handler(void (*handler)(const std::string &msg)) err_handler_ = handler; } -void registry::apply_all(const std::function)> &fun) +SPDLOG_INLINE void registry::apply_all(const std::function)> &fun) { std::lock_guard lock(logger_map_mutex_); for (auto &l : loggers_) @@ -182,7 +182,7 @@ void registry::apply_all(const std::function) } } -void registry::flush_all() +SPDLOG_INLINE void registry::flush_all() { std::lock_guard lock(logger_map_mutex_); for (auto &l : loggers_) @@ -191,7 +191,7 @@ void registry::flush_all() } } -void registry::drop(const std::string &logger_name) +SPDLOG_INLINE void registry::drop(const std::string &logger_name) { std::lock_guard lock(logger_map_mutex_); loggers_.erase(logger_name); @@ -201,7 +201,7 @@ void registry::drop(const std::string &logger_name) } } -void registry::drop_all() +SPDLOG_INLINE void registry::drop_all() { std::lock_guard lock(logger_map_mutex_); loggers_.clear(); @@ -209,7 +209,7 @@ void registry::drop_all() } // clean all resources and threads started by the registry -void registry::shutdown() +SPDLOG_INLINE void registry::shutdown() { { std::lock_guard lock(flusher_mutex_); @@ -224,24 +224,24 @@ void registry::shutdown() } } -std::recursive_mutex ®istry::tp_mutex() +SPDLOG_INLINE std::recursive_mutex ®istry::tp_mutex() { return tp_mutex_; } -void registry::set_automatic_registration(bool automatic_regsistration) +SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_regsistration) { std::lock_guard lock(logger_map_mutex_); automatic_registration_ = automatic_regsistration; } -registry ®istry::instance() +SPDLOG_INLINE registry ®istry::instance() { static registry s_instance; return s_instance; } -void registry::throw_if_exists_(const std::string &logger_name) +SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name) { if (loggers_.find(logger_name) != loggers_.end()) { @@ -249,7 +249,7 @@ void registry::throw_if_exists_(const std::string &logger_name) } } -void registry::register_logger_(std::shared_ptr new_logger) +SPDLOG_INLINE void registry::register_logger_(std::shared_ptr new_logger) { auto logger_name = new_logger->name(); throw_if_exists_(logger_name);