From: Radosław Zarzyński <rzarzyns@redhat.com>
Date: Thu, 28 Sep 2023 16:23:47 +0000 (+0200)
Subject: osd: make ECCommon compatible with libfmt
X-Git-Tag: v19.3.0~13^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7222fd65cd9ee518bc8a90cc13db4d5184f231e;p=ceph.git

osd: make ECCommon compatible with libfmt

For the crimson's sake.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
---

diff --git a/src/osd/ECCommon.h b/src/osd/ECCommon.h
index 2ef088f5bf1c..f074a79abaf8 100644
--- a/src/osd/ECCommon.h
+++ b/src/osd/ECCommon.h
@@ -16,6 +16,7 @@
 
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>
+#include <fmt/format.h>
 
 #include "common/sharedptr_registry.hpp"
 #include "erasure-code/ErasureCodeInterface.h"
@@ -689,3 +690,8 @@ std::ostream &operator<<(std::ostream &lhs,
 std::ostream &operator<<(std::ostream &lhs,
 			 const ECCommon::RMWPipeline::Op &rhs);
 
+template <> struct fmt::formatter<ECCommon::RMWPipeline::pipeline_state_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECCommon::read_request_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECCommon::read_result_t> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECCommon::ReadOp> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECCommon::RMWPipeline::Op> : fmt::ostream_formatter {};
diff --git a/src/osd/ECMsgTypes.h b/src/osd/ECMsgTypes.h
index bf10704125c0..2d0bc5c12216 100644
--- a/src/osd/ECMsgTypes.h
+++ b/src/osd/ECMsgTypes.h
@@ -15,6 +15,8 @@
 #ifndef ECBMSGTYPES_H
 #define ECBMSGTYPES_H
 
+#include <fmt/format.h>
+
 #include "osd_types.h"
 #include "include/buffer.h"
 #include "os/ObjectStore.h"
@@ -137,4 +139,9 @@ std::ostream &operator<<(
 std::ostream &operator<<(
   std::ostream &lhs, const ECSubReadReply &rhs);
 
+template <> struct fmt::formatter<ECSubWrite> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECSubWriteReply> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECSubRead> : fmt::ostream_formatter {};
+template <> struct fmt::formatter<ECSubReadReply> : fmt::ostream_formatter {};
+
 #endif