From mboxrd@z Thu Jan 1 00:00:00 1970 From: gbastien+lttng@versatic.net (=?UTF-8?q?Genevi=C3=A8ve=20Bastien?=) Date: Tue, 11 Feb 2014 16:40:48 -0500 Subject: [lttng-dev] [Patch LTTng-tools v2 1/5] Update data structures to support CTF global type declarations In-Reply-To: <1392154852-31268-1-git-send-email-gbastien+lttng@versatic.net> References: <1390594045-7556-1-git-send-email-gbastien+lttng@versatic.net> <1392154852-31268-1-git-send-email-gbastien+lttng@versatic.net> Message-ID: <1392154852-31268-2-git-send-email-gbastien+lttng@versatic.net> The structures match the LTTng-UST structure for supporting global type delcarations in general and CTF enumerations in particular. Signed-off-by: Genevi?ve Bastien --- src/bin/lttng-sessiond/lttng-ust-ctl.h | 36 +++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/bin/lttng-sessiond/lttng-ust-ctl.h b/src/bin/lttng-sessiond/lttng-ust-ctl.h index 7f59b86..41ed6c5 100644 --- a/src/bin/lttng-sessiond/lttng-ust-ctl.h +++ b/src/bin/lttng-sessiond/lttng-ust-ctl.h @@ -274,13 +274,23 @@ struct ustctl_float_type { char padding[USTCTL_UST_FLOAT_TYPE_PADDING]; } LTTNG_PACKED; -#define USTCTL_UST_BASIC_TYPE_PADDING 296 +#define USTCTL_UST_ENUM_ENTRY_PADDING 296 +struct ustctl_enum_entry { + unsigned long long start, end; /* start and end are inclusive */ + char string[LTTNG_UST_SYM_NAME_LEN]; + char padding[USTCTL_UST_ENUM_ENTRY_PADDING]; +}; + +#define USTCTL_UST_BASIC_TYPE_PADDING 40 union _ustctl_basic_type { struct ustctl_integer_type integer; struct { enum ustctl_string_encodings encoding; } string; struct ustctl_float_type _float; + struct { + char name[LTTNG_UST_SYM_NAME_LEN]; + } enumeration; char padding[USTCTL_UST_BASIC_TYPE_PADDING]; } LTTNG_PACKED; @@ -308,6 +318,30 @@ struct ustctl_type { } u; } LTTNG_PACKED; +#define USTCTL_UST_ENUM_TYPE_PADDING 296 +struct ustctl_enum { + char name[LTTNG_UST_SYM_NAME_LEN]; + struct ustctl_integer_type container_type; + struct ustctl_enum_entry *entries; + unsigned int len; + char padding[USTCTL_UST_ENUM_TYPE_PADDING]; +} LTTNG_PACKED; + +/* CTF categories for global types declared outside event descriptions */ +enum ustctl_global_type_categories { + ustctl_mtype_enum, + NR_USTCTL_GLOBAL_TYPES, +}; + +#define USTCTL_UST_GLOBAL_TYPE_DECL_PADDING 640 +struct ustctl_global_type_decl { + uint32_t mtype; + union { + struct ustctl_enum ctf_enum; + char padding[USTCTL_UST_GLOBAL_TYPE_DECL_PADDING]; + } u; +}; + #define USTCTL_UST_FIELD_PADDING 28 struct ustctl_field { char name[LTTNG_UST_SYM_NAME_LEN]; -- 1.8.5.4