From 7bc78f2de1ae6a6835b1428ff82bc1ef88405cf7 Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Fri, 30 Sep 2022 18:43:54 +0000
Subject: [PATCH] crimson/common/operation: demangle names in dump

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 src/crimson/common/operation.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/crimson/common/operation.h b/src/crimson/common/operation.h
index 61ad05887f4..0bb5c8e9532 100644
--- a/src/crimson/common/operation.h
+++ b/src/crimson/common/operation.h
@@ -7,6 +7,7 @@
 #include <array>
 #include <set>
 #include <vector>
+#include <boost/core/demangle.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
@@ -121,7 +122,10 @@ struct TimeEvent : Event<T> {
   } internal_backend;
 
   void dump(ceph::Formatter *f) const {
-    detail::dump_time_event(typeid(T).name(), internal_backend.timestamp, f);
+    auto demangled_name = boost::core::demangle(typeid(T).name());
+    detail::dump_time_event(
+      demangled_name.c_str(),
+      internal_backend.timestamp, f);
   }
 
   auto get_timestamp() const {
@@ -218,10 +222,12 @@ public:
     };
 
     void dump(ceph::Formatter *f) const {
-      detail::dump_blocking_event(typeid(T).name(),
-				  internal_backend.timestamp,
-				  internal_backend.blocker,
-				  f);
+      auto demangled_name = boost::core::demangle(typeid(T).name());
+      detail::dump_blocking_event(
+	demangled_name.c_str(),
+	internal_backend.timestamp,
+	internal_backend.blocker,
+	f);
     }
   };
 
-- 
2.47.3