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

clang-format static-lib

Browse Source
This commit is contained in:
gabime 2019-05-08 17:17:11 +03:00
parent 5d0eb6dda5
commit 1ac6c9f9c2
5 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/spdlog/common.h
View File

@ -23,7 +23,6 @@
#include "spdlog/fmt/fmt.h" #include "spdlog/fmt/fmt.h"
#ifdef SPDLOG_STATIC_LIB #ifdef SPDLOG_STATIC_LIB
#define SPDLOG_INLINE #define SPDLOG_INLINE
#else #else

2
include/spdlog/details/periodic_worker.h
View File

@ -29,7 +29,6 @@ public:
// stop the worker thread and join it // stop the worker thread and join it
~periodic_worker(); ~periodic_worker();
private: private:
bool active_; bool active_;
std::thread worker_thread_; std::thread worker_thread_;
@ -39,7 +38,6 @@ private:
} // namespace details } // namespace details
} // namespace spdlog } // namespace spdlog
#ifndef SPDLOG_STATIC_LIB #ifndef SPDLOG_STATIC_LIB
#include "spdlog/impl/periodic_worker.cpp" #include "spdlog/impl/periodic_worker.cpp"
#endif #endif

2
include/spdlog/details/thread_pool.h
View File

@ -127,7 +127,6 @@ public:
// message all threads to terminate gracefully join them // message all threads to terminate gracefully join them
~thread_pool(); ~thread_pool();
thread_pool(const thread_pool &) = delete; thread_pool(const thread_pool &) = delete;
thread_pool &operator=(thread_pool &&) = delete; thread_pool &operator=(thread_pool &&) = delete;
@ -135,7 +134,6 @@ public:
void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy); void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy);
size_t overrun_counter(); size_t overrun_counter();
private: private:
q_type q_; q_type q_;

1
include/spdlog/impl/periodic_worker.cpp
View File

@ -42,4 +42,3 @@ SPDLOG_INLINE spdlog::details::periodic_worker::~periodic_worker()
worker_thread_.join(); worker_thread_.join();
} }
} }

62
include/spdlog/impl/thread_pool.cpp
View File

@ -8,19 +8,20 @@ template class spdlog::details::mpmc_blocking_queue<spdlog::details::async_msg>;
#include "spdlog/common.h" #include "spdlog/common.h"
SPDLOG_INLINE spdlog::details::thread_pool::thread_pool(size_t q_max_items, size_t threads_n) : q_(q_max_items) SPDLOG_INLINE spdlog::details::thread_pool::thread_pool(size_t q_max_items, size_t threads_n)
: q_(q_max_items)
{ {
// std::cout << "thread_pool() q_size_bytes: " << q_size_bytes << // std::cout << "thread_pool() q_size_bytes: " << q_size_bytes <<
// "\tthreads_n: " << threads_n << std::endl; // "\tthreads_n: " << threads_n << std::endl;
if (threads_n == 0 || threads_n > 1000) if (threads_n == 0 || threads_n > 1000)
{ {
throw spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid " throw spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid "
"range is 1-1000)"); "range is 1-1000)");
} }
for (size_t i = 0; i < threads_n; i++) for (size_t i = 0; i < threads_n; i++)
{ {
threads_.emplace_back(&thread_pool::worker_loop_, this); threads_.emplace_back(&thread_pool::worker_loop_, this);
} }
} }
// message all threads to terminate gracefully join them // message all threads to terminate gracefully join them
@ -43,7 +44,8 @@ SPDLOG_INLINE spdlog::details::thread_pool::~thread_pool()
} }
} }
void SPDLOG_INLINE spdlog::details::thread_pool::post_log(async_logger_ptr &&worker_ptr, details::log_msg &msg, async_overflow_policy overflow_policy) void SPDLOG_INLINE spdlog::details::thread_pool::post_log(
async_logger_ptr &&worker_ptr, details::log_msg &msg, async_overflow_policy overflow_policy)
{ {
async_msg async_m(std::move(worker_ptr), async_msg_type::log, msg); async_msg async_m(std::move(worker_ptr), async_msg_type::log, msg);
post_async_msg_(std::move(async_m), overflow_policy); post_async_msg_(std::move(async_m), overflow_policy);
@ -90,27 +92,23 @@ bool SPDLOG_INLINE spdlog::details::thread_pool::process_next_msg_()
switch (incoming_async_msg.msg_type) switch (incoming_async_msg.msg_type)
{ {
case async_msg_type::log: case async_msg_type::log:
{ {
auto msg = incoming_async_msg.to_log_msg(); auto msg = incoming_async_msg.to_log_msg();
incoming_async_msg.worker_ptr->backend_log_(msg); incoming_async_msg.worker_ptr->backend_log_(msg);
return true; return true;
} }
case async_msg_type::flush: case async_msg_type::flush:
{ {
incoming_async_msg.worker_ptr->backend_flush_(); incoming_async_msg.worker_ptr->backend_flush_();
return true; return true;
} }
case async_msg_type::terminate: case async_msg_type::terminate:
{ {
return false; return false;
} }
} }
assert(false && "Unexpected async_msg_type"); assert(false && "Unexpected async_msg_type");
return true; return true;
} }