ceph-libfmt.patch

   1 --- ceph-17.2.7/src/common/hobject_fmt.h        2023-10-26 01:46:16.000000000 +0200
   2 +++ ceph-17.2.7.mod/src/common/hobject_fmt.h    2024-03-03 07:44:04.994865841 +0100
   3 @@ -9,6 +9,7 @@
   4  #include <fmt/ranges.h>
   5
   6  #include "common/hobject.h"
   7 +#include "include/object_fmt.h"
   8  #include "include/types_fmt.h"
   9  #include "msg/msg_fmt.h"
  10
  11 --- ceph-17.2.7/src/common/LogEntry.h   2023-10-26 01:46:16.000000000 +0200
  12 +++ ceph-17.2.7.mod/src/common/LogEntry.h       2024-03-02 07:42:35.321554400 +0100
  13 @@ -18,6 +18,7 @@
  14  #include <fmt/format.h>
  15
  16  #include "include/utime.h"
  17 +#include "include/utime_fmt.h"
  18  #include "msg/msg_fmt.h"
  19  #include "msg/msg_types.h"
  20  #include "common/entity_name.h"
  21 @@ -194,6 +195,9 @@
  22               << e.channel << " " << e.prio << " " << e.msg;
  23  }
  24
  25 +template <>
  26 +struct fmt::formatter<clog_type> : ostream_formatter {};
  27 +
  28  template <> struct fmt::formatter<EntityName> : fmt::formatter<std::string_view> {
  29    template <typename FormatContext>
  30    auto format(const EntityName& e, FormatContext& ctx) {
  31 --- ceph-17.2.7/src/include/types_fmt.h 2023-10-26 01:46:16.000000000 +0200
  32 +++ ceph-17.2.7.mod/src/include/types_fmt.h     2024-03-02 09:54:14.238851992 +0100
  33 @@ -6,6 +6,7 @@
  34   */
  35
  36  #include <fmt/format.h>
  37 +#include <fmt/ostream.h>
  38
  39  #include <string_view>
  40
  41 @@ -26,3 +27,9 @@
  42      return fmt::format_to(ctx.out(), "}}");
  43    }
  44  };
  45 +
  46 +template <typename T>
  47 +struct fmt::formatter<ceph_le<T>> : ostream_formatter {};
  48 +
  49 +template <>
  50 +struct fmt::formatter<shard_id_t> : ostream_formatter {};
  51 --- ceph-17.2.7/src/msg/async/frames_v2.cc      2023-10-26 01:46:16.000000000 +0200
  52 +++ ceph-17.2.7.mod/src/msg/async/frames_v2.cc  2024-03-01 19:04:33.315590782 +0100
  53 @@ -13,6 +13,7 @@
  54   */
  55
  56  #include "frames_v2.h"
  57 +#include "include/types_fmt.h"
  58
  59  #include <ostream>
  60
  61 --- ceph-17.2.7/src/tools/neorados.cc   2024-03-03 19:54:51.414457588 +0100
  62 +++ ceph-17.2.7.mod/src/tools/neorados.cc       2024-03-03 15:18:02.793213584 +0100
  63 @@ -143,7 +143,7 @@
  64      throw bs::system_error(ec,
  65                            fmt::format(
  66                              "when creating object '{}' in pool '{}'",
  67 -                            obj, pname));
  68 +                            fmt::streamed(obj), pname));
  69  }
  70
  71  inline constexpr std::size_t io_size = 4 << 20;
  72 @@ -179,7 +179,7 @@
  73      if (ec)
  74        throw bs::system_error(ec, fmt::format(
  75                                "when writing object '{}' in pool '{}'",
  76 -                              obj, pname));
  77 +                              fmt::streamed(obj), pname));
  78    }
  79  }
  80
  81 @@ -200,7 +200,7 @@
  82        throw bs::system_error(
  83         ec,
  84         fmt::format("when getting length of object '{}' in pool '{}'",
  85 -                   obj, pname));
  86 +                   fmt::streamed(obj), pname));
  87    }
  88
  89    std::size_t off = 0;
  90 @@ -213,7 +213,7 @@
  91        throw bs::system_error(
  92         ec,
  93         fmt::format("when reading from object '{}' in pool '{}'",
  94 -                   obj, pool));
  95 +                   fmt::streamed(obj), pool));
  96
  97      off += bl.length();
  98      bl.write_stream(std::cout);
  99 @@ -234,7 +234,7 @@
 100    if (ec)
 101      throw bs::system_error(ec, fmt::format(
 102                              "when removing object '{}' in pool '{}'",
 103 -                            obj, pname));
 104 +                            fmt::streamed(obj), pname));
 105  }
 106
 107  static constexpr auto version = std::make_tuple(0ul, 0ul, 1ul);