Commit 3ea7fb18 authored by gabime's avatar gabime

Fix potential race condidion when in logger copy ctor

Don't copy other.trace - just create a new one with same size instead
parent 6ff52332
...@@ -17,15 +17,20 @@ namespace details { ...@@ -17,15 +17,20 @@ namespace details {
class backtracer class backtracer
{ {
std::mutex mutex_; std::mutex mutex_;
size_t n_messages_;
circular_q<log_msg_buffer> messages_; circular_q<log_msg_buffer> messages_;
public: public:
explicit backtracer(size_t n_messages) : messages_{n_messages} explicit backtracer(size_t n_messages) : n_messages_{n_messages}, messages_{n_messages}
{} {}
backtracer(const backtracer &other) : messages_{other.messages_}
{} size_t n_messages() const
{
return n_messages_;
}
void add(const log_msg &msg) void add(const log_msg &msg)
{ {
std::lock_guard<std::mutex> lock{mutex_}; std::lock_guard<std::mutex> lock{mutex_};
......
...@@ -25,7 +25,7 @@ SPDLOG_INLINE logger::logger(const logger &other) ...@@ -25,7 +25,7 @@ SPDLOG_INLINE logger::logger(const logger &other)
{ {
if (other.tracer_) if (other.tracer_)
{ {
tracer_ = std::make_shared<details::backtracer>(*other.tracer_); tracer_ = std::make_shared<details::backtracer>(other.tracer_->n_messages());
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment