X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-channel.hpp;h=636de94aa9979ebfbf8a23e8d95a5a1c7a32e046;hb=HEAD;hp=e8819812e139aa28062f86dfb9202241cc81f8b5;hpb=d7bfb9b0fa35679d3e728b9165699d9faf905539;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry-channel.hpp b/src/bin/lttng-sessiond/ust-registry-channel.hpp
index e8819812e..636de94aa 100644
--- a/src/bin/lttng-sessiond/ust-registry-channel.hpp
+++ b/src/bin/lttng-sessiond/ust-registry-channel.hpp
@@ -9,13 +9,14 @@
 #define LTTNG_UST_REGISTRY_CHANNEL_H
 
 #include "stream-class.hpp"
+#include "trace-class.hpp"
 
 #include <common/hashtable/hashtable.hpp>
 
 #include <lttng/lttng.h>
 
-#include <urcu.h>
 #include <functional>
+#include <urcu.h>
 
 struct ust_app;
 
@@ -28,25 +29,32 @@ class registry_event;
 class registry_channel : public lttng::sessiond::trace::stream_class {
 public:
 	using registered_listener_fn = std::function<void(const registry_channel&)>;
-	using event_added_listener_fn = std::function<void(const registry_channel&, const registry_event &)>;
+	using event_added_listener_fn =
+		std::function<void(const registry_channel&, const registry_event&)>;
 
 	registry_channel(uint32_t channel_id,
-			registered_listener_fn channel_registered_listener,
-			event_added_listener_fn new_event_listener);
+			 const lttng::sessiond::trace::abi& trace_abi,
+			 std::string default_clock_class_name,
+			 registered_listener_fn channel_registered_listener,
+			 event_added_listener_fn new_event_listener);
 	void add_event(int session_objd,
-			int channel_objd,
-			std::string name,
-			std::string signature,
-			std::vector<lttng::sessiond::trace::field::cuptr> event_fields,
-			int loglevel_value,
-			nonstd::optional<std::string> model_emf_uri,
-			lttng_buffer_type buffer_type,
-			const ust_app& app,
-			uint32_t& out_event_id);
-	virtual ~registry_channel();
-
-	virtual const lttng::sessiond::trace::type& get_context() const override final;
-	void set_context(lttng::sessiond::trace::type::cuptr context);
+		       int channel_objd,
+		       std::string name,
+		       std::string signature,
+		       std::vector<lttng::sessiond::trace::field::cuptr> event_fields,
+		       int loglevel_value,
+		       nonstd::optional<std::string> model_emf_uri,
+		       lttng_buffer_type buffer_type,
+		       const ust_app& app,
+		       uint32_t& out_event_id);
+	~registry_channel() override;
+	registry_channel(const registry_channel&) = delete;
+	registry_channel(registry_channel&&) = delete;
+	registry_channel& operator=(registry_channel&&) = delete;
+	registry_channel& operator=(const registry_channel&) = delete;
+
+	const lttng::sessiond::trace::type *event_context() const final;
+	void event_context(lttng::sessiond::trace::type::cuptr context);
 
 	/* Channel was registered to at least one application. */
 	bool is_registered() const;
@@ -55,12 +63,6 @@ public:
 	uint64_t _key;
 	uint64_t _consumer_key;
 
-	/*
-	 * Flag for this channel if the metadata was dumped once during
-	 * registration. 0 means no, 1 yes.
-	 */
-	unsigned int _metadata_dumped;
-
 	/*
 	 * Hash table containing events sent by the UST tracer. MUST be accessed
 	 * with a RCU read side lock acquired.
@@ -73,8 +75,8 @@ public:
 	uint32_t _next_event_id;
 
 private:
-	virtual void _accept_on_event_classes(
-			lttng::sessiond::trace::trace_class_visitor& trace_class_visitor) const override final;
+	void _accept_on_event_classes(
+		lttng::sessiond::trace::trace_class_visitor& trace_class_visitor) const final;
 
 	registered_listener_fn _is_registered_listener;
 	event_added_listener_fn _event_added_listener;