Clean-up: sessiond: rename public accessors

[lttng-tools.git] / src / bin / lttng-sessiond / stream-class.hpp

diff --git a/src/bin/lttng-sessiond/stream-class.hpp b/src/bin/lttng-sessiond/stream-class.hpp
index 636d0b136690ed82dd9ef2edf987be90fb66bbd7..754b723fa5eec49f316089ab8d0c4c13288f6045 100644 (file)
--- 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 {
@@ -29,16 +31,28 @@ public:
        void accept(trace_class_visitor& visitor) const;
        virtual ~stream_class() = default;
 
-       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 */