X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-session.hpp;h=5a26d1aab4215caea21328b7954d13ddbc50b770;hb=9d89db29f3bf6c826293350f8f1a8559ec906b24;hp=cce7c5c1b7baef7958f80f10c0e9eef9ceca883c;hpb=3691d312bcf4dc2cc15f0ecb1f0e2fd2f34315b8;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry-session.hpp b/src/bin/lttng-sessiond/ust-registry-session.hpp
index cce7c5c1b..5a26d1aab 100644
--- a/src/bin/lttng-sessiond/ust-registry-session.hpp
+++ b/src/bin/lttng-sessiond/ust-registry-session.hpp
@@ -41,13 +41,13 @@ public:
 					details::locked_registry_session_release>::
 					deleter>;
 
-	virtual lttng_buffer_type get_buffering_scheme() const noexcept = 0;
+	virtual lttng_buffer_type buffering_scheme() const noexcept = 0;
 	locked_ptr lock() noexcept;
 
 	void add_channel(uint64_t channel_key);
 
 	/* A channel is protected by its parent registry session's lock. */
-	lttng::sessiond::ust::registry_channel& get_channel(uint64_t channel_key) const;
+	lttng::sessiond::ust::registry_channel& channel(uint64_t channel_key) const;
 
 	void remove_channel(uint64_t channel_key, bool notify);
 
@@ -56,11 +56,18 @@ public:
 			struct lttng_ust_ctl_enum_entry *raw_entries,
 			size_t nr_entries,
 			uint64_t *enum_id);
-	registry_enum::const_rcu_protected_reference get_enumeration(
+	registry_enum::const_rcu_protected_reference enumeration(
 			const char *enum_name, uint64_t enum_id) const;
 
 	void regenerate_metadata();
-	virtual ~registry_session();
+
+	~registry_session() override;
+	registry_session(const registry_session&) = delete;
+	registry_session(registry_session&&) = delete;
+	registry_session& operator=(registry_session&&) = delete;
+	registry_session& operator=(const registry_session&) = delete;
+
+	const lttng::sessiond::trace::type *packet_header() const noexcept override;
 
 	/*
 	 * With multiple writers and readers, use this lock to access
@@ -102,9 +109,8 @@ protected:
 			uid_t euid,
 			gid_t egid,
 			uint64_t tracing_id);
-	virtual void _visit_environment(
-			lttng::sessiond::trace::trace_class_visitor& trace_class_visitor)
-			const override;
+	void accept(
+			trace::trace_class_environment_visitor& environment_visitor) const override;
 	void _generate_metadata();
 
 private:
@@ -114,13 +120,14 @@ private:
 	void _reset_metadata();
 	void _destroy_enum(registry_enum *reg_enum) noexcept;
 	registry_enum *_lookup_enum(const registry_enum *target_enum) const;
+	lttng::sessiond::trace::type::cuptr _create_packet_header() const;
 
-	virtual void _accept_on_clock_classes(
+	void _accept_on_clock_classes(
 			lttng::sessiond::trace::trace_class_visitor& trace_class_visitor)
-			const override final;
-	virtual void _accept_on_stream_classes(
+			const final;
+	void _accept_on_stream_classes(
 			lttng::sessiond::trace::trace_class_visitor& trace_class_visitor)
-			const override final;
+			const final;
 
 	/* Next channel ID available for a newly registered channel. */
 	uint32_t _next_channel_id = 0;
@@ -191,8 +198,9 @@ private:
 	/* The id of the parent session. */
 	const ltt_session::id_t _tracing_id;
 
-	lttng::sessiond::ust::clock_class _clock;
+	lttng::sessiond::ust::clock_class::cuptr _clock;
 	const lttng::sessiond::trace::trace_class_visitor::cuptr _metadata_generating_visitor;
+	lttng::sessiond::trace::type::cuptr _packet_header;
 };
 
 } /* namespace ust */