X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Fust-ctl.h;h=19fba726b56c049a141b5259b2105d1f76d6fadb;hb=218deb69baab57ee2f6728eef18e84697f21197b;hp=4b254efac37d458025379116c73151070ec77458;hpb=f9ec4a97118c6ba6001af5a85d63512e0fc441a1;p=deliverable%2Flttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 4b254efa..19fba726 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -313,13 +313,18 @@ enum ustctl_channel_header {
 
 enum ustctl_abstract_types {
 	ustctl_atype_integer,
-	ustctl_atype_enum,
-	ustctl_atype_array,
-	ustctl_atype_sequence,
+	ustctl_atype_enum,	/* legacy */
+	ustctl_atype_array,	/* legacy */
+	ustctl_atype_sequence,	/* legacy */
 	ustctl_atype_string,
 	ustctl_atype_float,
-	ustctl_atype_variant,
-	ustctl_atype_struct,
+	ustctl_atype_variant,	/* legacy */
+	ustctl_atype_struct,	/* legacy */
+	ustctl_atype_enum_nestable,
+	ustctl_atype_array_nestable,
+	ustctl_atype_sequence_nestable,
+	ustctl_atype_struct_nestable,
+	ustctl_atype_variant_nestable,
 	NR_USTCTL_ABSTRACT_TYPES,
 };
 
@@ -373,6 +378,7 @@ struct ustctl_enum_entry {
 	} u;
 } LTTNG_PACKED;
 
+/* legacy */
 #define USTCTL_UST_BASIC_TYPE_PADDING	296
 union _ustctl_basic_type {
 	struct ustctl_integer_type integer;
@@ -388,6 +394,7 @@ union _ustctl_basic_type {
 	char padding[USTCTL_UST_BASIC_TYPE_PADDING];
 } LTTNG_PACKED;
 
+/* legacy */
 struct ustctl_basic_type {
 	enum ustctl_abstract_types atype;
 	union {
@@ -395,28 +402,67 @@ struct ustctl_basic_type {
 	} u;
 } LTTNG_PACKED;
 
-#define USTCTL_UST_TYPE_PADDING	128
+/*
+ * Padding is derived from largest member: u.legacy.sequence which
+ * contains two basic types, each with USTCTL_UST_BASIC_TYPE_PADDING.
+ */
+#define USTCTL_UST_TYPE_PADDING	(2 * USTCTL_UST_BASIC_TYPE_PADDING)
 struct ustctl_type {
 	enum ustctl_abstract_types atype;
 	union {
-		union _ustctl_basic_type basic;
+		struct ustctl_integer_type integer;
+		struct ustctl_float_type _float;
+		struct {
+			int32_t encoding;	/* enum ustctl_string_encodings */
+		} string;
+		struct {
+			char name[LTTNG_UST_SYM_NAME_LEN];
+			uint64_t id;	/* enum ID in sessiond. */
+			/* container_type follows after this struct ustctl_field. */
+		} enum_nestable;
 		struct {
-			struct ustctl_basic_type elem_type;
 			uint32_t length;		/* num. elems. */
-		} array;
+			uint32_t alignment;
+			/* elem_type follows after this struct ustctl_field. */
+		} array_nestable;
 		struct {
-			struct ustctl_basic_type length_type;
-			struct ustctl_basic_type elem_type;
-		} sequence;
+			char length_name[LTTNG_UST_SYM_NAME_LEN];
+			uint32_t alignment;		/* Alignment before elements. */
+			/* elem_type follows after the length_type. */
+		} sequence_nestable;
+		struct {
+			uint32_t nr_fields;
+			uint32_t alignment;
+			/* Followed by nr_fields struct ustctl_field. */
+		} struct_nestable;
 		struct {
 			uint32_t nr_choices;
 			char tag_name[LTTNG_UST_SYM_NAME_LEN];
+			uint32_t alignment;
 			/* Followed by nr_choices struct ustctl_field. */
-		} variant;
-		struct {
-			uint32_t nr_fields;
-			/* Followed by nr_fields struct ustctl_field. */
-		} _struct;
+		} variant_nestable;
+
+		/* Legacy ABI */
+		union {
+			union _ustctl_basic_type basic;
+			struct {
+				struct ustctl_basic_type elem_type;
+				uint32_t length;		/* num. elems. */
+			} array;
+			struct {
+				struct ustctl_basic_type length_type;
+				struct ustctl_basic_type elem_type;
+			} sequence;
+			struct {
+				uint32_t nr_fields;
+				/* Followed by nr_fields struct ustctl_field. */
+			} _struct;
+			struct {
+				uint32_t nr_choices;
+				char tag_name[LTTNG_UST_SYM_NAME_LEN];
+				/* Followed by nr_choices struct ustctl_field. */
+			} variant;
+		} legacy;
 		char padding[USTCTL_UST_TYPE_PADDING];
 	} u;
 } LTTNG_PACKED;