Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-11-16 09:28:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
gabime
2019-08-22 19:38:00 +03:00
parent 6b527a50dd
commit f1718fb5b3
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/spdlog/details/log_msg_buffer.h
View File

@@ -17,31 +17,34 @@ struct log_msg_buffer : log_msg
fmt::basic_memory_buffer<char, 200> payload_buf;
log_msg_buffer() = default;
log_msg_buffer(const log_msg &orig_msg): log_msg(orig_msg)
log_msg_buffer(const log_msg &orig_msg)
: log_msg(orig_msg)
{
update_buffers();
}
log_msg_buffer(const log_msg_buffer& other):log_msg(other)
log_msg_buffer(const log_msg_buffer &other)
: log_msg(other)
{
update_buffers();
}
log_msg_buffer(const log_msg_buffer&& other):log_msg(std::move(other))
log_msg_buffer(const log_msg_buffer &&other)
: log_msg(std::move(other))
{
update_buffers();
}
log_msg_buffer& operator=(log_msg_buffer &other) SPDLOG_NOEXCEPT
log_msg_buffer &operator=(log_msg_buffer &other) SPDLOG_NOEXCEPT
{
*static_cast<log_msg*>(this) = other;
*static_cast<log_msg *>(this) = other;
update_buffers();
return *this;
}
log_msg_buffer& operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT
log_msg_buffer &operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT
{
*static_cast<log_msg*>(this) = std::move(other);
*static_cast<log_msg *>(this) = std::move(other);
update_buffers();
return *this;
}
@@ -53,10 +56,10 @@ struct log_msg_buffer : log_msg
logger_name = string_view_t{loggername_buf.data(), loggername_buf.size()};
payload_buf.clear();
payload_buf.append(payload.data(),payload.data() + payload.size());
payload_buf.append(payload.data(), payload.data() + payload.size());
payload = string_view_t{payload_buf.data(), payload_buf.size()};
}
};
}
}
} // namespace details
} // namespace spdlog

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

@@ -7,7 +7,6 @@
#include "spdlog/details/mpmc_blocking_q.h"
#include "spdlog/details/os.h"
#include <chrono>
#include <memory>
#include <thread>
@@ -31,9 +30,9 @@ enum class async_msg_type
#include "spdlog/details/log_msg_buffer.h"
// Async msg to move to/from the queue
// Movable only. should never be copied
struct async_msg:log_msg_buffer
struct async_msg : log_msg_buffer
{
async_msg_type msg_type {async_msg_type::log};
async_msg_type msg_type{async_msg_type::log};
async_logger_ptr worker_ptr;
async_msg() = default;
@@ -53,7 +52,7 @@ struct async_msg:log_msg_buffer
async_msg &operator=(async_msg &&other)
{
*static_cast<log_msg_buffer*>(this) = std::move(other);
*static_cast<log_msg_buffer *>(this) = std::move(other);
msg_type = other.msg_type;
worker_ptr = std::move(other.worker_ptr);
return *this;
@@ -68,8 +67,7 @@ struct async_msg:log_msg_buffer
: log_msg_buffer(m)
, msg_type(the_type)
, worker_ptr(std::move(worker))
{
}
{}
async_msg(async_logger_ptr &&worker, async_msg_type the_type)
: log_msg_buffer()
@@ -80,7 +78,6 @@ struct async_msg:log_msg_buffer
explicit async_msg(async_msg_type the_type)
: async_msg(nullptr, the_type)
{}
};
class thread_pool