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

Add attribution, return to previous code for daily_filename_format_calculator with fmtlib

Browse Source
This commit is contained in:
Charles Milette 2021-11-16 11:22:30 -05:00
parent ad779e4865
commit 4001032858
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ inline void append_int(T n, memory_buf_t &dest)
template<typename T> template<typename T>
SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n) SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n)
{ {
// taken from fmt. // taken from fmt: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/format.h#L899-L912
unsigned int count = 1; unsigned int count = 1;
for (;;) for (;;)
{ {

37
include/spdlog/sinks/daily_file_sink.h
View File

@ -5,9 +5,9 @@
#include <spdlog/common.h> #include <spdlog/common.h>
#include <spdlog/details/file_helper.h> #include <spdlog/details/file_helper.h>
#include <spdlog/details/fmt_helper.h>
#include <spdlog/details/null_mutex.h> #include <spdlog/details/null_mutex.h>
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
#include <spdlog/fmt/chrono.h>
#include <spdlog/sinks/base_sink.h> #include <spdlog/sinks/base_sink.h>
#include <spdlog/details/os.h> #include <spdlog/details/os.h>
#include <spdlog/details/circular_q.h> #include <spdlog/details/circular_q.h>
@ -48,8 +48,9 @@ struct daily_filename_format_calculator
{ {
static filename_t calc_filename(const filename_t &filename, const tm &now_tm) static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
{ {
// adapted from fmtlib
#ifdef SPDLOG_USE_STD_FORMAT #ifdef SPDLOG_USE_STD_FORMAT
// adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546
filename_t tm_format; filename_t tm_format;
tm_format.append(filename); tm_format.append(filename);
// By appending an extra space we can distinguish an empty result that // By appending an extra space we can distinguish an empty result that
@ -74,31 +75,13 @@ struct daily_filename_format_calculator
return buf; return buf;
#else #else
fmt::basic_memory_buffer<filename_t::value_type> tm_format; // generate fmt datetime format string, e.g. {:%Y-%m-%d}.
tm_format.append(filename.c_str(), filename.c_str() + filename.size()); filename_t fmt_filename = fmt::format(SPDLOG_FILENAME_T("{{:{}}}"), filename);
// By appending an extra space we can distinguish an empty result that # if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesn't allow fmt::runtime(..) with wchar here
// indicates insufficient buffer size from a guaranteed non-empty result return fmt::format(fmt_filename, now_tm);
// https://github.com/fmtlib/fmt/issues/2238 # else
tm_format.push_back(' '); return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
tm_format.push_back('\0'); # endif
fmt::basic_memory_buffer<filename_t::value_type> buf;
size_t start = buf.size();
for (;;)
{
size_t size = buf.capacity() - start;
size_t count = strftime(&buf[start], size, &tm_format[0], &now_tm);
if (count != 0)
{
// Remove the extra space.
buf.resize(start + count - 1);
break;
}
const size_t MIN_GROWTH = 10;
buf.reserve(buf.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH));
}
return fmt::to_string(buf);
#endif #endif
} }