X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ffield.hpp;h=79017416617efb22a168633cd1dec65a34559132;hb=e7360180aa8c4d8f5bfec86a6a020bbc616ff2c0;hp=f66fdbe7f440dc3c51a237c58fa75977002d84c6;hpb=96bf95ffff3f039d7bf4ba0e9c8f92aefaf82d82;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/field.hpp b/src/bin/lttng-sessiond/field.hpp
index f66fdbe7f..790174166 100644
--- a/src/bin/lttng-sessiond/field.hpp
+++ b/src/bin/lttng-sessiond/field.hpp
@@ -76,11 +76,30 @@ public:
 		HEXADECIMAL = 16,
 	};
 
+	enum class role {
+		DEFAULT_CLOCK_TIMESTAMP,
+		/* Packet header field class specific roles. */
+		DATA_STREAM_CLASS_ID,
+		DATA_STREAM_ID,
+		PACKET_MAGIC_NUMBER,
+		/* Packet context field class specific roles. */
+		DISCARDED_EVENT_RECORD_COUNTER_SNAPSHOT,
+		PACKET_CONTENT_LENGTH,
+		PACKET_END_DEFAULT_CLOCK_TIMESTAMP,
+		PACKET_SEQUENCE_NUMBER,
+		PACKET_TOTAL_LENGTH,
+		/* Event record field class roles. */
+		EVENT_RECORD_CLASS_ID,
+	};
+
+	using roles = std::vector<role>;
+
 	integer_type(unsigned int alignment,
 			byte_order byte_order,
 			unsigned int size,
 			signedness signedness,
-			base base);
+			base base,
+			roles roles = {});
 
 	virtual void accept(type_visitor& visitor) const override;
 
@@ -93,6 +112,7 @@ public:
 	 */
 	const signedness signedness_;
 	const base base_;
+	const roles roles_;
 
 protected:
 	virtual bool _is_equal(const type& other) const noexcept override;
@@ -121,7 +141,8 @@ protected:
 			enum byte_order byte_order,
 			unsigned int size,
 			enum signedness signedness,
-			enum base base);
+			enum base base,
+			integer_type::roles roles = {});
 
 	virtual void accept(type_visitor& visitor) const = 0;
 };
@@ -192,14 +213,17 @@ public:
 	typed_enumeration_type(unsigned int in_alignment,
 			enum byte_order in_byte_order,
 			unsigned int in_size,
-			enum signedness in_signedness,
 			enum base in_base,
-			const std::shared_ptr<const mappings>& in_mappings) :
+			const std::shared_ptr<const mappings>& in_mappings,
+			integer_type::roles in_roles = {}) :
 		enumeration_type(in_alignment,
 				in_byte_order,
 				in_size,
-				in_signedness,
-				in_base),
+				std::is_signed<MappingIntegerType>::value ?
+						integer_type::signedness::SIGNED :
+						      integer_type::signedness::UNSIGNED,
+				in_base,
+				std::move(in_roles)),
 		_mappings{std::move(in_mappings)}
 	{
 	}
@@ -260,6 +284,38 @@ private:
 	virtual bool _is_equal(const type& base_other) const noexcept override final;
 };
 
+class static_length_blob_type : public type {
+public:
+	enum class role {
+		/* Packet header field class specific role. */
+		TRACE_CLASS_UUID,
+	};
+
+	using roles = std::vector<role>;
+
+	static_length_blob_type(unsigned int alignment, uint64_t in_length_bytes, roles roles = {});
+
+	virtual void accept(type_visitor& visitor) const override final;
+
+	const uint64_t length_bytes;
+	const roles roles_;
+
+private:
+	virtual bool _is_equal(const type& base_other) const noexcept override final;
+};
+
+class dynamic_length_blob_type : public type {
+public:
+	dynamic_length_blob_type(unsigned int alignment, std::string length_field_name);
+
+	virtual void accept(type_visitor& visitor) const override final;
+
+	const std::string length_field_name;
+
+private:
+	virtual bool _is_equal(const type& base_other) const noexcept override final;
+};
+
 class string_type : public type {
 public:
 	enum class encoding {
@@ -358,6 +414,8 @@ public:
 	virtual void visit(const unsigned_enumeration_type& type) = 0;
 	virtual void visit(const static_length_array_type& type) = 0;
 	virtual void visit(const dynamic_length_array_type& type) = 0;
+	virtual void visit(const static_length_blob_type& type) = 0;
+	virtual void visit(const dynamic_length_blob_type& type) = 0;
 	virtual void visit(const null_terminated_string_type& type) = 0;
 	virtual void visit(const static_length_string_type& type) = 0;
 	virtual void visit(const dynamic_length_string_type& type) = 0;