X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-dynamic-type.c;h=c94d6cc4ae139a0a87d4197a2cf1dfbdd913f86d;hb=14e0a13576200091ccaba54c89692ee21672a700;hp=488cf8156cba55587a4b391137ef57c90ec4abc0;hpb=a6f80644ef276de19ba7e018659070b7504d7ca4;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-dynamic-type.c b/liblttng-ust/lttng-ust-dynamic-type.c
index 488cf815..c94d6cc4 100644
--- a/liblttng-ust/lttng-ust-dynamic-type.c
+++ b/liblttng-ust/lttng-ust-dynamic-type.c
@@ -1,50 +1,37 @@
 /*
- * lttng-ust-dynamic-type.c
- *
- * UST dynamic type implementation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * UST dynamic type implementation.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <inttypes.h>
 
-#include <helper.h>
-#include <lttng/ust-dynamic-type.h>
+#include <ust-helper.h>
+#include <ust-dynamic-type.h>
 
 #define ctf_enum_value(_string, _value)					\
-	{								\
+	__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, {		\
+		.struct_size = sizeof(struct lttng_ust_enum_entry),		\
 		.start = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
-			.value = lttng_is_signed_type(__typeof__(_value)) ? \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
+			.value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
 		},							\
 		.end = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
-			.value = lttng_is_signed_type(__typeof__(_value)) ? \
+			.signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
+			.value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
 		},							\
 		.string = (_string),					\
-	},
+	}),
 
-static const struct lttng_enum_entry dt_enum[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
+static struct lttng_ust_enum_entry *dt_enum[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
 	[LTTNG_UST_DYNAMIC_TYPE_NONE] = ctf_enum_value("_none", 0)
 	[LTTNG_UST_DYNAMIC_TYPE_S8] = ctf_enum_value("_int8", 1)
 	[LTTNG_UST_DYNAMIC_TYPE_S16] = ctf_enum_value("_int16", 2)
@@ -59,111 +46,129 @@ static const struct lttng_enum_entry dt_enum[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
 	[LTTNG_UST_DYNAMIC_TYPE_STRING] = ctf_enum_value("_string", 11)
 };
 
-static const struct lttng_enum_desc dt_enum_desc = {
+static struct lttng_ust_enum_desc dt_enum_desc = {
 	.name = "dynamic_type_enum",
 	.entries = dt_enum,
 	.nr_entries = LTTNG_ARRAY_SIZE(dt_enum),
 };
 
-const struct lttng_event_field dt_var_fields[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
-	[LTTNG_UST_DYNAMIC_TYPE_NONE] = {
+struct lttng_ust_event_field *dt_var_fields[_NR_LTTNG_UST_DYNAMIC_TYPES] = {
+	[LTTNG_UST_DYNAMIC_TYPE_NONE] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "none",
-		.type = {
-			.atype = atype_struct,
-			.u._struct.nr_fields = 0,	/* empty struct. */
-		},
+		.type = (struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_struct, {
+			.parent = {
+				.type = lttng_ust_type_struct,
+			},
+			.struct_size = sizeof(struct lttng_ust_type_struct),
+			.nr_fields = 0,	/* empty struct */
+			.alignment = 0,
+		}),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_S8] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_S8] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int8",
-		.type = __type_integer(int8_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(int8_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_S16] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_S16] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int16",
-		.type = __type_integer(int16_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(int16_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_S32] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_S32] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int32",
-		.type = __type_integer(int32_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(int32_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_S64] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_S64] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "int64",
-		.type = __type_integer(int64_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(int64_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_U8] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_U8] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint8",
-		.type = __type_integer(uint8_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(uint8_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_U16] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_U16] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint16",
-		.type = __type_integer(uint16_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(uint16_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_U32] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_U32] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint32",
-		.type = __type_integer(uint32_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(uint32_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_U64] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_U64] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "uint64",
-		.type = __type_integer(uint64_t, BYTE_ORDER, 10, none),
+		.type = lttng_ust_type_integer_define(uint64_t, BYTE_ORDER, 10),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_FLOAT] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_FLOAT] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "float",
-		.type = __type_float(float),
+		.type = lttng_ust_type_float_define(float),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_DOUBLE] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_DOUBLE] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "double",
-		.type = __type_float(double),
+		.type = lttng_ust_type_float_define(double),
 		.nowrite = 0,
-	},
-	[LTTNG_UST_DYNAMIC_TYPE_STRING] = {
+	}),
+	[LTTNG_UST_DYNAMIC_TYPE_STRING] = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_event_field, {
+		.struct_size = sizeof(struct lttng_ust_event_field),
 		.name = "string",
-		.type = {
-			.atype = atype_string,
-			.u.basic.string.encoding = lttng_encode_UTF8,
-		},
+		.type = (struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_string, {
+			.parent = {
+				.type = lttng_ust_type_string,
+			},
+			.struct_size = sizeof(struct lttng_ust_type_string),
+			.encoding = lttng_ust_string_encoding_UTF8,
+		}),
 		.nowrite = 0,
-	},
+	}),
 };
 
-static const struct lttng_event_field dt_enum_field = {
+static struct lttng_ust_event_field dt_enum_field = {
+	.struct_size = sizeof(struct lttng_ust_event_field),
 	.name = NULL,
-	.type.atype = atype_enum,
-	.type.u.basic.enumeration.desc = &dt_enum_desc,
-	.type.u.basic.enumeration.container_type = {
-		.size = sizeof(char) * CHAR_BIT,
-		.alignment = lttng_alignof(char) * CHAR_BIT,
-		.signedness = lttng_is_signed_type(char),
-		.reverse_byte_order = 0,
-		.base = 10,
-		.encoding = lttng_encode_none,
-	},
+	.type = (struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_enum, {
+		.parent = {
+			.type = lttng_ust_type_enum,
+		},
+		.struct_size = sizeof(struct lttng_ust_type_enum),
+		.desc = &dt_enum_desc,
+		.container_type = lttng_ust_type_integer_define(char, BYTE_ORDER, 10),
+	}),
 	.nowrite = 0,
 };
 
-const struct lttng_event_field *lttng_ust_dynamic_type_field(int64_t value)
+struct lttng_ust_event_field *lttng_ust_dynamic_type_field(int64_t value)
 {
 	if (value >= _NR_LTTNG_UST_DYNAMIC_TYPES || value < 0)
 		return NULL;
-	return &dt_var_fields[value];
+	return dt_var_fields[value];
 }
 
-int lttng_ust_dynamic_type_choices(size_t *nr_choices, const struct lttng_event_field **choices)
+int lttng_ust_dynamic_type_choices(size_t *nr_choices, struct lttng_ust_event_field ***choices)
 {
 	*nr_choices = _NR_LTTNG_UST_DYNAMIC_TYPES;
 	*choices = dt_var_fields;
 	return 0;
 }
 
-const struct lttng_event_field *lttng_ust_dynamic_type_tag_field(void)
+struct lttng_ust_event_field *lttng_ust_dynamic_type_tag_field(void)
 {
 	return &dt_enum_field;
 }