X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fformat.hpp;h=020766eb5ddd788dfd7c8114a6bd993e7817cfdf;hb=HEAD;hp=b49a793b9a83808e4ea2203dffe54e0b45f74982;hpb=05aa7e19ec97871aad18d7c9787c4c89611cd2cd;p=lttng-tools.git

diff --git a/src/common/format.hpp b/src/common/format.hpp
index b49a793b9..2ba6cef12 100644
--- a/src/common/format.hpp
+++ b/src/common/format.hpp
@@ -9,6 +9,10 @@
 
 #include <common/macros.hpp>
 
+#include <cxxabi.h>
+#include <string>
+#include <utility>
+
 DIAGNOSTIC_PUSH
 DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
 DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
@@ -16,4 +20,44 @@ DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
 #include <vendor/fmt/core.h>
 DIAGNOSTIC_POP
 
+#include <common/make-unique-wrapper.hpp>
+
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
+namespace fmt {
+template <>
+struct formatter<std::type_info> : formatter<std::string> {
+	template <typename FormatContextType>
+	typename FormatContextType::iterator format(const std::type_info& type_info,
+						    FormatContextType& ctx)
+	{
+		int status;
+		/*
+		 * The documentation of __cxa_demangle mentions the returned string is allocated
+		 * using malloc (not new), hence the use of lttng::memory::free.
+		 */
+		const auto demangled_name = lttng::make_unique_wrapper<char, lttng::memory::free>(
+			abi::__cxa_demangle(type_info.name(), nullptr, nullptr, &status));
+
+		auto it = status == 0 ? formatter<std::string>::format(demangled_name.get(), ctx) :
+					formatter<std::string>::format(type_info.name(), ctx);
+		return it;
+	}
+};
+} /* namespace fmt */
+
+namespace lttng {
+template <typename... FormattingArguments>
+std::string format(FormattingArguments&&...args)
+{
+	try {
+		return fmt::format(std::forward<FormattingArguments>(args)...);
+	} catch (const fmt::format_error& ex) {
+		return std::string("Failed to format string: ") += ex.what();
+	}
+}
+} /* namespace lttng */
+
 #endif /* LTTNG_FORMAT_H */