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

clang-format

Browse Source
This commit is contained in:
gabime 2018-07-26 21:13:19 +03:00
parent 420b17ae65
commit fd54719351
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/async.h
View File

@ -41,7 +41,7 @@ struct async_factory_impl
{ {
auto &registry_inst = details::registry::instance(); auto &registry_inst = details::registry::instance();
//create global thread pool if not already exists.. // create global thread pool if not already exists..
std::lock_guard<std::recursive_mutex>(registry_inst.tp_mutex()); std::lock_guard<std::recursive_mutex>(registry_inst.tp_mutex());
auto tp = registry_inst.get_tp(); auto tp = registry_inst.get_tp();
if (tp == nullptr) if (tp == nullptr)

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

@ -72,7 +72,6 @@ public:
tp_ = std::move(tp); tp_ = std::move(tp);
} }
std::shared_ptr<thread_pool> get_tp() std::shared_ptr<thread_pool> get_tp()
{ {
std::lock_guard<std::recursive_mutex> lock(tp_mutex_); std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
@ -173,7 +172,7 @@ public:
} }
} }
std::recursive_mutex &tp_mutex() std::recursive_mutex &tp_mutex()
{ {
return tp_mutex_; return tp_mutex_;
} }
@ -183,7 +182,6 @@ public:
static registry s_instance; static registry s_instance;
return s_instance; return s_instance;
} }
private: private:
registry() registry()
@ -206,7 +204,7 @@ private:
} }
std::mutex logger_map_mutex_, flusher_mutex_; std::mutex logger_map_mutex_, flusher_mutex_;
std::recursive_mutex tp_mutex_; std::recursive_mutex tp_mutex_;
std::unordered_map<std::string, std::shared_ptr<logger>> loggers_; std::unordered_map<std::string, std::shared_ptr<logger>> loggers_;
std::unique_ptr<formatter> formatter_; std::unique_ptr<formatter> formatter_;
level::level_enum level_ = level::info; level::level_enum level_ = level::info;