RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/net/ProtocolV2: include fmt/chrono.h if fmt version >= 6.0

Browse Source 
* check libfmt version instead of the exisistence of chrono.h, as
  libfmt merged fmt/time.h into fmt/chrono.h since v 6.0, while in
  libfmt v5.3, fmt/chrono.h did not provide all the necessary bits
  for fmt::to_format(..., const tm&). see also
  a939c75956
  and https://github.com/fmtlib/fmt/blob/master/ChangeLog.rst
* use fmt API instead of libc API for getting `localtime()`, it's
  more C++ friendly than plain `localtime_r()`

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-08-28 00:50:06 +08:00
parent 101cc1fb51
commit 9d0ff5b3b9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/crimson/net/ProtocolV2.cc
View File

@ -5,7 +5,7 @@
#include <seastar/core/lowres_clock.hh>
#include <fmt/format.h>
#if __has_include(<fmt/chrono.h>)
#if FMT_VERSION >= 60000
#include <fmt/chrono.h>
#else
#include <fmt/time.h>
@ -95,9 +95,8 @@ inline uint64_t generate_client_cookie() {
} // namespace anonymous
namespace fmt {
template <>
struct formatter<seastar::lowres_system_clock::time_point> {
struct fmt::formatter<seastar::lowres_system_clock::time_point> {
// ignore the format string
template <typename ParseContext>
constexpr auto parse(ParseContext &ctx) { return ctx.begin(); }
@ -105,17 +104,14 @@ struct formatter<seastar::lowres_system_clock::time_point> {
template <typename FormatContext>
auto format(const seastar::lowres_system_clock::time_point& t,
FormatContext& ctx) {
struct tm bdt;
time_t tt = std::chrono::duration_cast<std::chrono::seconds>(
std::time_t tt = std::chrono::duration_cast<std::chrono::seconds>(
t.time_since_epoch()).count();
localtime_r(&tt, &bdt);
auto milliseconds = (t.time_since_epoch() %
std::chrono::seconds(1)).count();
return format_to(ctx.out(), "{:%Y-%m-%d %H:%M:%S} {:03d}",
bdt, milliseconds);
return fmt::format_to(ctx.out(), "{:%Y-%m-%d %H:%M:%S} {:03d}",
fmt::localtime(tt), milliseconds);
}
};
}
namespace std {
inline ostream& operator<<(