Commit a6e2f237 authored by gabime's avatar gabime

Pattern formatter optimizations

parent 87e01353
...@@ -26,17 +26,13 @@ inline void append_buf(const fmt::memory_buffer &buf, fmt::memory_buffer &dest) ...@@ -26,17 +26,13 @@ inline void append_buf(const fmt::memory_buffer &buf, fmt::memory_buffer &dest)
dest.append(buf_ptr, buf_ptr + buf.size()); dest.append(buf_ptr, buf_ptr + buf.size());
} }
inline void append_int(int n, fmt::memory_buffer &dest) template<typename T>
inline void append_int(T n, fmt::memory_buffer &dest)
{ {
fmt::format_int i(n); fmt::format_int i(n);
dest.append(i.data(), i.data() + i.size()); dest.append(i.data(), i.data() + i.size());
} }
inline void append_size_t(size_t n, fmt::memory_buffer &dest)
{
fmt::format_int i(n);
dest.append(i.data(), i.data() + i.size());
}
inline void append_and_pad2(int n, fmt::memory_buffer &dest) inline void append_and_pad2(int n, fmt::memory_buffer &dest)
{ {
...@@ -64,12 +60,17 @@ inline void append_and_pad3(int n, fmt::memory_buffer &dest) ...@@ -64,12 +60,17 @@ inline void append_and_pad3(int n, fmt::memory_buffer &dest)
} }
if (n > 9) // 10-99 if (n > 9) // 10-99
{ {
dest.push_back('0'); dest.push_back('0');
dest.push_back('0' + n / 10);
dest.push_back('0' + n % 10);
return;
} }
else if (n >= 0) else if (n >= 0)
{ {
dest.push_back('0'); dest.push_back('0');
dest.push_back('0'); dest.push_back('0');
dest.push_back('0' + n);
return;
} }
// negatives (unlikely, but just in case let fmt deal with it) // negatives (unlikely, but just in case let fmt deal with it)
else else
...@@ -77,7 +78,7 @@ inline void append_and_pad3(int n, fmt::memory_buffer &dest) ...@@ -77,7 +78,7 @@ inline void append_and_pad3(int n, fmt::memory_buffer &dest)
fmt::format_to(dest, "{:03}", n); fmt::format_to(dest, "{:03}", n);
return; return;
} }
append_int(n, dest);
} }
inline void append_and_pad6(int n, fmt::memory_buffer &dest) inline void append_and_pad6(int n, fmt::memory_buffer &dest)
......
...@@ -20,28 +20,6 @@ public: ...@@ -20,28 +20,6 @@ public:
virtual ~formatter() = default; virtual ~formatter() = default;
virtual void format(const details::log_msg &msg, fmt::memory_buffer &dest) = 0; virtual void format(const details::log_msg &msg, fmt::memory_buffer &dest) = 0;
}; };
namespace details {
class flag_formatter;
}
class pattern_formatter SPDLOG_FINAL : public formatter
{
public:
explicit pattern_formatter(const std::string &pattern, pattern_time_type pattern_time = pattern_time_type::local,
std::string eol = spdlog::details::os::default_eol);
pattern_formatter(const pattern_formatter &) = default;
pattern_formatter &operator=(const pattern_formatter &) = default;
void format(const details::log_msg &msg, fmt::memory_buffer &dest) override;
private:
const std::string eol_;
const pattern_time_type pattern_time_;
std::vector<std::unique_ptr<details::flag_formatter>> formatters_;
std::tm get_time(const details::log_msg &msg);
void handle_flag(char flag);
void compile_pattern(const std::string &pattern);
};
} // namespace spdlog } // namespace spdlog
#include "details/pattern_formatter_impl.h" #include "details/pattern_formatter_impl.h"
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