X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-class.hpp;h=ed72f3f579e9cdaabc34a91ddcade7ec5ac60c2d;hb=88277a52069ed0135254ce29da617ebb6ecddbb8;hp=087499866e097775dfc0bf4f2b2a564e1a4e3df8;hpb=0220be14254fac4f7af642fd6630282b29776a70;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-class.hpp b/src/bin/lttng-sessiond/trace-class.hpp
index 087499866..ed72f3f57 100644
--- a/src/bin/lttng-sessiond/trace-class.hpp
+++ b/src/bin/lttng-sessiond/trace-class.hpp
@@ -8,6 +8,8 @@
 #ifndef LTTNG_TRACE_CLASS_H
 #define LTTNG_TRACE_CLASS_H
 
+#include "field.hpp"
+
 #include <common/uuid.hpp>
 
 namespace lttng {
@@ -18,11 +20,7 @@ class clock_class;
 class stream_class;
 class event_class;
 class trace_class_visitor;
-
-enum class byte_order {
-	BIG_ENDIAN_,
-	LITTLE_ENDIAN_,
-};
+class trace_class_environment_visitor;
 
 struct abi {
 	unsigned int bits_per_long;
@@ -42,19 +40,22 @@ public:
 	{
 	}
 
-	const char * const name;
+	const char* const name;
 	const ValueType& value;
 };
 
 class trace_class {
 public:
+
+	virtual ~trace_class() = default;
+
 	/*
 	 * Derived classes must implement the _accept_on_*()
 	 * to continue the traversal to the trace class' children.
 	 */
 	virtual void accept(trace_class_visitor& trace_class_visitor) const;
-
-	virtual ~trace_class() = default;
+	virtual void accept(trace_class_environment_visitor& environment_visitor) const = 0;
+	virtual const lttng::sessiond::trace::type *get_packet_header() const noexcept = 0;
 
 	const struct abi abi;
 	const lttng_uuid uuid;
@@ -62,33 +63,27 @@ public:
 protected:
 	trace_class(const struct abi& abi, const lttng_uuid& trace_uuid);
 	virtual void _accept_on_clock_classes(trace_class_visitor& trace_class_visitor) const = 0;
-	virtual void _visit_environment(trace_class_visitor& trace_class_visitor) const = 0;
 	virtual void _accept_on_stream_classes(trace_class_visitor& trace_class_visitor) const = 0;
 };
 
+class trace_class_environment_visitor {
+public:
+	virtual ~trace_class_environment_visitor() = default;
+
+	virtual void visit(const environment_field<int64_t>& field) = 0;
+	virtual void visit(const environment_field<const char *>& field) = 0;
+	virtual void visit(const environment_field<std::string>& field);
+};
+
 class trace_class_visitor {
 public:
 	using cuptr = std::unique_ptr<trace_class_visitor>;
 
 	virtual ~trace_class_visitor() = default;
 
-	/* trace class visitor interface. */
 	virtual void visit(const lttng::sessiond::trace::trace_class& trace_class) = 0;
-
-	/* clock class visitor interface. */
 	virtual void visit(const lttng::sessiond::trace::clock_class& clock_class) = 0;
-
-	/* environment visitor interface. */
-	virtual void environment_begin() = 0;
-	virtual void visit(const environment_field<int64_t>& field) = 0;
-	virtual void visit(const environment_field<const char *>& field) = 0;
-	void visit(const environment_field<std::string>& field);
-	virtual void environment_end() = 0;
-
-	/* stream class visitor interface. */
 	virtual void visit(const lttng::sessiond::trace::stream_class& stream_class) = 0;
-
-	/* event class visitor interface. */
 	virtual void visit(const lttng::sessiond::trace::event_class& event_class) = 0;
 };