X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fstream-class.hpp;h=5faecd5e1eb41c3fd824eec132afe652c17fa997;hb=42a11b8f4c8d98b33fa1eadcdcda96253e651f0b;hp=636d0b136690ed82dd9ef2edf987be90fb66bbd7;hpb=0220be14254fac4f7af642fd6630282b29776a70;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/stream-class.hpp b/src/bin/lttng-sessiond/stream-class.hpp
index 636d0b136..5faecd5e1 100644
--- a/src/bin/lttng-sessiond/stream-class.hpp
+++ b/src/bin/lttng-sessiond/stream-class.hpp
@@ -10,6 +10,8 @@
 
 #include "field.hpp"
 
+#include <vendor/optional.hpp>
+
 #include <vector>
 
 namespace lttng {
@@ -28,17 +30,33 @@ public:
 	 */
 	void accept(trace_class_visitor& visitor) const;
 	virtual ~stream_class() = default;
+	stream_class(const stream_class&) = delete;
+	stream_class(stream_class&&) = delete;
+	stream_class& operator=(stream_class&&) = delete;
+	stream_class& operator=(const stream_class&) = delete;
 
-	virtual const lttng::sessiond::trace::type& get_context() const;
+	virtual const type *packet_context() const;
+	virtual const type *event_header() const;
+	virtual const type *event_context() const;
 
 	const unsigned int id;
-	const header_type header_type;
+	/*
+	 * header_type is suffixed with '_' to work-around a bug in older
+	 * GCCs (before 6) that do not recognize hidden/shadowed enumeration as valid
+	 * nested-name-specifiers.
+	 */
+	const header_type header_type_;
+	const nonstd::optional<std::string> default_clock_class_name;
 
 protected:
-	stream_class(unsigned int id, enum header_type header_type);
+	stream_class(unsigned int id,
+		     enum header_type header_type,
+		     nonstd::optional<std::string> default_clock_class_name = nonstd::nullopt);
 	virtual void _accept_on_event_classes(trace_class_visitor& trace_class_visitor) const = 0;
 
-	lttng::sessiond::trace::type::cuptr _context;
+	lttng::sessiond::trace::type::cuptr _packet_context;
+	lttng::sessiond::trace::type::cuptr _event_header;
+	lttng::sessiond::trace::type::cuptr _event_context;
 };
 
 } /* namespace trace */