mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-26 10:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimized scoped_pad

Browse Source
This commit is contained in:
gabime 2018-11-10 18:03:11 +02:00
parent 5c54414be7
commit 3ff541cf77
1 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
include/spdlog/details/pattern_formatter.h
View File

@ -25,6 +25,7 @@
namespace spdlog { namespace spdlog {
namespace details { namespace details {
// padding information.
struct padding_info struct padding_info
{ {
enum pad_side enum pad_side
@ -42,21 +43,36 @@ struct padding_info
} }
const size_t width_ = 0; const size_t width_ = 0;
const pad_side side_ = left; const pad_side side_ = left;
const char fill_ = '.';
}; };
class scoped_pad class scoped_pad
{ {
public: public:
scoped_pad(size_t text_size, padding_info &padinfo, fmt::memory_buffer &dest)
: text_size_(text_size) static const size_t max_width = 128;
, padinfo_(padinfo)
scoped_pad(size_t wrapped_size, padding_info &padinfo, fmt::memory_buffer &dest):
padinfo_(padinfo)
, dest_(dest) , dest_(dest)
, nchars_(padinfo_.width_ > wrapped_size ? padinfo_.width_ - wrapped_size : 0)
{ {
// if (padinfo_.pad_left_)
if (padinfo_.side_ == padding_info::left || padinfo_.side_ == padding_info::center) if(nchars_ == 0)
{ {
pad(true); return;
}
if (padinfo_.side_ == padding_info::left)
{
pad_it(nchars_);
nchars_ = 0;
return;
}
else if(padinfo_.side_ == padding_info::center)
{
pad_it(nchars_/ 2);
return;
} }
} }
@ -67,35 +83,36 @@ public:
~scoped_pad() ~scoped_pad()
{ {
if (padinfo_.side_ == padding_info::right || padinfo_.side_ == padding_info::center)
{
pad(false);
}
}
private: if(nchars_ == 0)
void pad(bool is_left_side)
{
if (padinfo_.width_ <= text_size_)
{ {
return; return;
} }
auto howmany = padinfo_.width_ - text_size_; if (padinfo_.side_ == padding_info::right)
if (padinfo_.side_ == padding_info::center)
{ {
auto reminder = is_left_side ? howmany % 2 : 0; pad_it(nchars_);
howmany = (howmany / 2) + reminder;
} }
for (size_t i = 0; i < howmany; i++) else // padinfo_.side_ == padding_info::center
{ {
dest_.push_back(padinfo_.fill_);
pad_it( (nchars_/ 2) + (nchars_% 2) ) ;
} }
} }
const size_t text_size_; private:
void pad_it(size_t count)
{
//count = std::min(count, spaces_.size());
fmt_helper::append_string_view(string_view_t(spaces_.data(), count), dest_);
}
const padding_info &padinfo_; const padding_info &padinfo_;
fmt::memory_buffer &dest_; fmt::memory_buffer &dest_;
size_t nchars_;
string_view_t spaces_ = " "
" ";
}; };
class flag_formatter class flag_formatter
@ -664,7 +681,7 @@ public:
{ {
const size_t field_size = 6; const size_t field_size = 6;
scoped_pad p(field_size, padinfo_, dest); scoped_pad p(field_size, padinfo_, dest);
fmt_helper::pad6(details::os::pid(), dest); fmt_helper::pad6(static_cast<size_t>(details::os::pid()), dest);
} }
}; };
@ -1065,7 +1082,7 @@ private:
details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end) details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end)
{ {
using details::padding_info; using details::padding_info;
const size_t max_width = 4096; using details::scoped_pad;
if (it == end) if (it == end)
{ {
@ -1099,7 +1116,7 @@ private:
auto digit = static_cast<size_t>(*it - '0'); auto digit = static_cast<size_t>(*it - '0');
width = width * 10 + digit; width = width * 10 + digit;
} }
return details::padding_info{std::min(width, max_width), side}; return details::padding_info{std::min(width, scoped_pad::max_width), side};
} }
void compile_pattern_(const std::string &pattern) void compile_pattern_(const std::string &pattern)