X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-session.cpp;fp=src%2Fbin%2Flttng-sessiond%2Fust-registry-session.cpp;h=e1089bd58678eaf07e07a416b0ffbe4373cd5513;hb=da9dd5212ebacf388ebe26aa80fd0ddcf7ffe049;hp=03a87e2868f98d4f36848e0f2f45d9f3a88e41c4;hpb=45110cdd99bd9ecc13a12d29afde3fffa48b4641;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp
index 03a87e286..e1089bd58 100644
--- a/src/bin/lttng-sessiond/ust-registry-session.cpp
+++ b/src/bin/lttng-sessiond/ust-registry-session.cpp
@@ -11,6 +11,7 @@
 #include "session.hpp"
 #include "trace-class.hpp"
 #include "tsdl-trace-class-visitor.hpp"
+#include "ctf2-trace-class-visitor.hpp"
 #include "ust-app.hpp"
 #include "ust-field-convert.hpp"
 #include "ust-registry.hpp"
@@ -222,7 +223,6 @@ unsigned long ht_hash_enum(void *_key, unsigned long seed)
 	LTTNG_ASSERT(key);
 	return hash_key_str(key->name.c_str(), seed);
 }
-
 } /* namespace */
 
 void lsu::details::locked_registry_session_release(lsu::registry_session *session)
@@ -302,7 +302,7 @@ lst::type::cuptr lsu::registry_session::_create_packet_header() const
 	/* uuid */
 	packet_header_fields.emplace_back(lttng::make_unique<lst::field>("uuid",
 			lttng::make_unique<lst::static_length_blob_type>(0, 16,
-					std::initializer_list<lst::static_length_blob_type::role>({lst::static_length_blob_type::role::TRACE_CLASS_UUID}))));
+					std::initializer_list<lst::static_length_blob_type::role>({lst::static_length_blob_type::role::METADATA_STREAM_UUID}))));
 
 	/* uint32_t stream_id */
 	packet_header_fields.emplace_back(lttng::make_unique<lst::field>("stream_id",
@@ -495,8 +495,8 @@ void lsu::registry_session::remove_channel(uint64_t channel_key, bool notify)
 	destroy_channel(&channel, notify);
 }
 
-void lsu::registry_session::_visit_environment(
-		lttng::sessiond::trace::trace_class_visitor& visitor) const
+void lsu::registry_session::accept(
+		lttng::sessiond::trace::trace_class_environment_visitor& visitor) const
 {
 	ASSERT_LOCKED(_lock);
 
@@ -647,7 +647,7 @@ void lsu::registry_session::_reset_metadata()
 
 void lsu::registry_session::_generate_metadata()
 {
-	accept(*_metadata_generating_visitor);
+	trace_class::accept(*_metadata_generating_visitor);
 }
 
 void lsu::registry_session::regenerate_metadata()