X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftsdl-trace-class-visitor.cpp;h=dce1af96c8f6045622c34372fde818116576b3b6;hb=4bcf2294f0701b731d620c38216e1922e919e1b9;hp=ac1be1bf2233cf2d186b212762e6f1a4069b3cab;hpb=b6bbb1d666531bf061f29884da1b0d7c10f59aa0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
index ac1be1bf2..dce1af96c 100644
--- a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
+++ b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
@@ -397,7 +397,7 @@ public:
 	}
 
 	/* Only call once. */
-	std::string transfer_description()
+	std::string move_description()
 	{
 		return std::move(_description);
 	}
@@ -797,7 +797,7 @@ public:
 	}
 
 	/* Only call once. */
-	std::string transfer_description()
+	std::string move_description()
 	{
 		_environment += "};\n\n";
 		return std::move(_environment);
@@ -828,7 +828,7 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::trace_class&
 
 	tsdl_field_visitor packet_header_visitor{trace_class.abi, 1, _sanitized_types_overrides};
 
-	trace_class.get_packet_header()->accept(packet_header_visitor);
+	trace_class.packet_header()->accept(packet_header_visitor);
 
 	/* Declare type aliases, trace class, and packet header. */
 	auto trace_class_tsdl = fmt::format(
@@ -852,14 +852,14 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::trace_class&
 			fmt::arg("uuid", lttng::utils::uuid_to_str(trace_class.uuid)),
 			fmt::arg("byte_order",
 					trace_class.abi.byte_order == lst::byte_order::BIG_ENDIAN_ ? "be" : "le"),
-			fmt::arg("packet_header_layout", packet_header_visitor.transfer_description()));
+			fmt::arg("packet_header_layout", packet_header_visitor.move_description()));
 
 	/* Declare trace scope and type aliases. */
 	append_metadata_fragment(trace_class_tsdl);
 
 	tsdl_trace_environment_visitor environment_visitor;
 	trace_class.accept(environment_visitor);
-	append_metadata_fragment(environment_visitor.transfer_description());
+	append_metadata_fragment(environment_visitor.move_description());
 }
 
 void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::clock_class& clock_class)
@@ -903,7 +903,7 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::stream_class
 				return _lookup_field_type(location);
 			});
 
-	const auto *event_header = stream_class.get_event_header();
+	const auto *event_header = stream_class.event_header();
 	if (event_header) {
 		tsdl_field_visitor event_header_visitor{_trace_abi, 1, _sanitized_types_overrides,
 				stream_class.default_clock_class_name};
@@ -911,10 +911,10 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::stream_class
 		event_header->accept(variant_sanitizer);
 		event_header->accept(event_header_visitor);
 		stream_class_str += fmt::format("	event.header := {};\n",
-				event_header_visitor.transfer_description());
+				event_header_visitor.move_description());
 	}
 
-	const auto *packet_context = stream_class.get_packet_context();
+	const auto *packet_context = stream_class.packet_context();
 	if (packet_context) {
 		tsdl_field_visitor packet_context_visitor{_trace_abi, 1, _sanitized_types_overrides,
 				stream_class.default_clock_class_name};
@@ -922,17 +922,17 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::stream_class
 		packet_context->accept(variant_sanitizer);
 		packet_context->accept(packet_context_visitor);
 		stream_class_str += fmt::format("	packet.context := {};\n",
-				packet_context_visitor.transfer_description());
+				packet_context_visitor.move_description());
 	}
 
-	const auto *event_context = stream_class.get_event_context();
+	const auto *event_context = stream_class.event_context();
 	if (event_context) {
 		tsdl_field_visitor event_context_visitor{_trace_abi, 1, _sanitized_types_overrides};
 
 		event_context->accept(variant_sanitizer);
 		event_context->accept(event_context_visitor);
 		stream_class_str += fmt::format("	event.context := {};\n",
-				event_context_visitor.transfer_description());
+				event_context_visitor.move_description());
 	}
 
 	stream_class_str += "};\n\n";
@@ -972,7 +972,7 @@ void tsdl::trace_class_visitor::visit(const lttng::sessiond::trace::event_class&
 	event_class.payload->accept(payload_visitor);
 
 	event_class_str += fmt::format(
-			"	fields := {};\n}};\n\n", payload_visitor.transfer_description());
+			"	fields := {};\n}};\n\n", payload_visitor.move_description());
 
 	append_metadata_fragment(event_class_str);
 }
@@ -1094,16 +1094,16 @@ const lttng::sessiond::trace::type& lttng::sessiond::tsdl::trace_class_visitor::
 	switch (location.root_) {
 	case lst::field_location::root::PACKET_HEADER:
 		return lookup_type_from_root_type(
-				*_current_trace_class->get_packet_header(), location);
+				*_current_trace_class->packet_header(), location);
 	case lst::field_location::root::PACKET_CONTEXT:
 		return lookup_type_from_root_type(
-				*_current_stream_class->get_packet_context(), location);
+				*_current_stream_class->packet_context(), location);
 	case lst::field_location::root::EVENT_RECORD_HEADER:
 		return lookup_type_from_root_type(
-				*_current_stream_class->get_event_header(), location);
+				*_current_stream_class->event_header(), location);
 	case lst::field_location::root::EVENT_RECORD_COMMON_CONTEXT:
 		return lookup_type_from_root_type(
-				*_current_stream_class->get_event_context(), location);
+				*_current_stream_class->event_context(), location);
 	case lst::field_location::root::EVENT_RECORD_PAYLOAD:
 		return lookup_type_from_root_type(
 				*_current_event_class->payload, location);