Clean-up: ensure all template parameter names end with Type

[lttng-tools.git] / src / bin / lttng-sessiond / ust-registry-event.hpp

diff --git a/src/bin/lttng-sessiond/ust-registry-event.hpp b/src/bin/lttng-sessiond/ust-registry-event.hpp
index 08b18a5c7504da8cfa5c3efd10ac021f64a1d35f..b38b09553c18d432f96b98a9a49eb254fdf2a4f3 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry-event.hpp
+++ b/src/bin/lttng-sessiond/ust-registry-event.hpp
@@ -36,7 +36,7 @@ public:
                        std::vector<lttng::sessiond::trace::field::cuptr> fields,
                        int loglevel_value,
                        nonstd::optional<std::string> model_emf_uri);
-       virtual ~registry_event() = default;
+       ~registry_event() override = default;
 
        /* Both objd are set by the tracer. */
        const int session_objd;
@@ -53,7 +53,8 @@ public:
         * Node in the ust-registry hash table. The event name is used to
         * initialize the node and the event_name/signature for the match function.
         */
-       struct lttng_ht_node_u64 _node;
+       struct cds_lfht_node _node;
+       struct rcu_head _head;
 };
 
 void registry_event_destroy(registry_event *event);
@@ -62,17 +63,23 @@ void registry_event_destroy(registry_event *event);
 } /* namespace sessiond */
 } /* namespace lttng */
 
+/*
+ * 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 fmt::formatter<lttng::sessiond::ust::registry_event> : fmt::formatter<std::string> {
-       template <typename FormatCtx>
-       typename FormatCtx::iterator format(
-                       const lttng::sessiond::ust::registry_event& event, FormatCtx& ctx)
+struct formatter<lttng::sessiond::ust::registry_event> : formatter<std::string> {
+       template <typename FormatContextType>
+       typename FormatContextType::iterator format(
+                       const lttng::sessiond::ust::registry_event& event, FormatContextType& ctx)
        {
-               return fmt::format_to(ctx.out(),
+               return format_to(ctx.out(),
                                "{{ name = `{}`, signature = `{}`, id = {}, session objd = {}, channel objd = {} }}",
                                event.name, event.signature, event.id, event.session_objd,
                                event.channel_objd);
        }
 };
+} /* namespace fmt */
 
 #endif /* LTTNG_UST_REGISTRY_EVENT_H */