Merge pull request ceph#58990 from Matan-B/wip-matanb-fmt-draft

fmt: bump up version + related changes

Reviewed-by: Yingxin Cheng <[email protected]>
Reviewed-by: Radosław Zarzyński <[email protected]>

Author: Matan-B

ceph.spec.in

@@ -115,10 +115,12 @@
 %ifarch x86_64
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without system_qat
-%else # not fedora/rhel
+%else
+# not fedora/rhel
 %bcond_with system_qat
 %endif
-%else # not x86_64
+%else
+# not x86_64
 %bcond_with system_qat
 %endif
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 || 0%{?openEuler}

src/CMakeLists.txt

@@ -362,6 +362,7 @@ else()
   message(STATUS "Building fmt as submodule")
   set(old_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
   set(BUILD_SHARED_LIBS FALSE)
+  set(FMT_INSTALL OFF)
   add_subdirectory(fmt)
   set(BUILD_SHARED_LIBS ${old_BUILD_SHARED_LIBS})
   unset(old_BUILD_SHARED_LIBS)

src/common/LogEntry.h

@@ -18,6 +18,7 @@
 #include <fmt/format.h>
 
 #include "include/utime.h"
+#include "include/utime_fmt.h"
 #include "msg/msg_fmt.h"
 #include "msg/msg_types.h"
 #include "common/entity_name.h"
@@ -217,14 +218,14 @@ template <> struct fmt::formatter<clog_type> : fmt::ostream_formatter {};
 
 template <> struct fmt::formatter<EntityName> : fmt::formatter<std::string_view> {
   template <typename FormatContext>
-  auto format(const EntityName& e, FormatContext& ctx) {
+  auto format(const EntityName& e, FormatContext& ctx) const {
     return formatter<std::string_view>::format(e.to_str(), ctx);
   }
 };
 
 template <> struct fmt::formatter<LogEntry> : fmt::formatter<std::string_view> {
   template <typename FormatContext>
-  auto format(const LogEntry& e, FormatContext& ctx) {
+  auto format(const LogEntry& e, FormatContext& ctx) const {
     return fmt::format_to(ctx.out(), "{} {} ({}) {} : {} [{}] {}",
                           e.stamp, e.name, e.rank, e.seq, e.channel,
                           LogEntry::level_to_str(e.prio), e.msg);

src/common/fmt_common.h

@@ -38,11 +38,19 @@ template<class T>
 concept has_alt_fmt_print = requires(T t) {
   { t.alt_fmt_print(bool{}) } -> std::same_as<std::string>;
 };
+#if FMT_VERSION >= 110000
+template<class T>
+concept has_fmt_print_ctx = requires(
+  T t, fmt::buffered_context<char> &ctx) {
+  { t.fmt_print_ctx(ctx) } -> std::same_as<decltype(ctx.out())>;
+};
+#else
 template<class T>
 concept has_fmt_print_ctx = requires(
   T t, fmt::buffer_context<char> &ctx) {
   { t.fmt_print_ctx(ctx) } -> std::same_as<decltype(ctx.out())>;
 };
+#endif
 
 namespace fmt {
 

src/crimson/common/formatter.cc

@@ -19,7 +19,7 @@ struct fmt::formatter<seastar::lowres_system_clock::time_point> {
 
   template <typename FormatContext>
   auto format(const seastar::lowres_system_clock::time_point& t,
-              FormatContext& ctx) {
+              FormatContext& ctx) const {
     std::time_t tt = std::chrono::duration_cast<std::chrono::seconds>(
       t.time_since_epoch()).count();
     auto milliseconds = (t.time_since_epoch() %

src/crimson/mon/MonClient.cc

@@ -14,6 +14,7 @@
 #include "auth/RotatingKeyRing.h"
 
 #include "common/hostname.h"
+#include "include/utime_fmt.h"
 
 #include "crimson/auth/KeyRing.h"
 #include "crimson/common/config_proxy.h"
@@ -243,7 +244,7 @@ Connection::do_auth_single(Connection::request_t what)
       return std::make_optional(auth_result_t::canceled);
     }
     logger().info("do_auth_single: {} returns {}: {}",
-                  *conn, *m, m->result);
+                  *conn, *m, (int)m->result);
     auto p = m->result_bl.cbegin();
     auto ret = auth->handle_response(m->result, p,
 				     nullptr, nullptr);
@@ -806,7 +807,7 @@ seastar::future<> Client::handle_auth_reply(crimson::net::Connection &conn,
                                             Ref<MAuthReply> m)
 {
   logger().info("handle_auth_reply {} returns {}: {}",
-                conn, *m, m->result);
+                conn, *m, (int)m->result);
   auto found = std::find_if(pending_conns.begin(), pending_conns.end(),
                             [peer_addr = conn.get_peer_addr()](auto& mc) {
                               return mc->is_my_peer(peer_addr);

src/crimson/net/FrameAssemblerV2.cc

@@ -441,7 +441,7 @@ void FrameAssemblerV2::log_main_preamble(const ceph::bufferlist &bl)
     reinterpret_cast<const preamble_block_t*>(bl.front().c_str());
   logger().trace("{} SEND({}) frame: tag={}, num_segments={}, crc={}",
                  conn, bl.length(), (int)main_preamble->tag,
-                 (int)main_preamble->num_segments, main_preamble->crc);
+                 (int)main_preamble->num_segments, (uint32_t)main_preamble->crc);
 }
 
 FrameAssemblerV2Ref FrameAssemblerV2::create(SocketConnection &conn)

src/crimson/net/Socket.cc

@@ -290,7 +290,7 @@ Socket::connect(const entity_addr_t &peer_addr)
     auto ret = std::make_unique<Socket>(
       std::move(socket), side_t::connector, 0, construct_tag{});
     logger().debug("Socket::connect(): connected to {}, socket {}",
-                   peer_addr, fmt::ptr(ret));
+                   peer_addr, fmt::ptr(ret.get()));
     return ret;
   });
 }
@@ -431,7 +431,7 @@ ShardedServerSocket::accept(accept_func_t &&_fn_accept)
               peer_addr.get_port(), Socket::construct_tag{});
           logger().debug("ShardedServerSocket({})::accept(): accepted peer {}, "
                          "socket {}, dispatch_only_on_primary_sid = {}",
-                         ss.listen_addr, peer_addr, fmt::ptr(_socket),
+                         ss.listen_addr, peer_addr, fmt::ptr(_socket.get()),
                          ss.dispatch_only_on_primary_sid);
           std::ignore = seastar::with_gate(
               ss.shutdown_gate,

src/crimson/net/SocketMessenger.cc

@@ -19,6 +19,7 @@
 #include <tuple>
 #include <boost/functional/hash.hpp>
 #include <fmt/os.h>
+#include <fmt/std.h>
 
 #include "auth/Auth.h"
 #include "Errors.h"

src/crimson/net/io_handler.cc

@@ -12,6 +12,7 @@
 #include "crimson/net/SocketMessenger.h"
 #include "msg/Message.h"
 #include "msg/msg_fmt.h"
+#include "include/utime_fmt.h"
 
 using namespace ceph::msgr::v2;
 using crimson::common::local_conf;
@@ -1018,10 +1019,10 @@ IOHandler::read_message(
                    msg_frame.front_len(),
                    msg_frame.middle_len(),
                    msg_frame.data_len(),
-                   current_header.type,
+                   (uint16_t)current_header.type,
                    conn.get_peer_name(),
-                   current_header.data_off,
-                   current_header.seq);
+                   (uint16_t)current_header.data_off,
+                   (uint32_t)current_header.seq);
 
     ceph_msg_header header{current_header.seq,
                            current_header.tid,
@@ -1088,7 +1089,7 @@ IOHandler::read_message(
       logger().debug("{} <== #{},{} === {} ({})",
                      conn,
                      message->get_seq(),
-                     current_header.ack_seq,
+                     (uint32_t)current_header.ack_seq,
                      *message,
                      message->get_type());
     }