X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-dynamic-type.c;h=ccda6475d7a773793aeaaee05f44f8b27cb5b605;hb=891d6b550bf16672b0c3a7b35362f231d6e10fc1;hp=9c72e71f14c321c40ff9dc61b3868aa424b3ac70;hpb=218deb69baab57ee2f6728eef18e84697f21197b;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-dynamic-type.c b/liblttng-ust/lttng-ust-dynamic-type.c index 9c72e71f..ccda6475 100644 --- a/liblttng-ust/lttng-ust-dynamic-type.c +++ b/liblttng-ust/lttng-ust-dynamic-type.c @@ -1,37 +1,23 @@ /* - * lttng-ust-dynamic-type.c - * - * UST dynamic type implementation. + * SPDX-License-Identifier: LGPL-2.1-only * * Copyright (C) 2016 Mathieu Desnoyers * - * 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 #include #include #include -#include -#include +#include +#include #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)) ? \ @@ -43,9 +29,9 @@ (long long) (_value) : (_value), \ }, \ .string = (_string), \ - }, + }), -static const struct lttng_enum_entry dt_enum[_NR_LTTNG_UST_DYNAMIC_TYPES] = { +static const 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) @@ -60,14 +46,15 @@ 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 const 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] = { +const 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_nestable, @@ -75,68 +62,79 @@ const struct lttng_event_field dt_var_fields[_NR_LTTNG_UST_DYNAMIC_TYPES] = { .u.struct_nestable.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), .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), .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), .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), .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), .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), .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), .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), .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), .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), .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.string.encoding = lttng_encode_UTF8, }, .nowrite = 0, - }, + }), }; -static const struct lttng_event_field dt_enum_field = { +static const struct lttng_ust_event_field dt_enum_field = { .name = NULL, .type.atype = atype_enum_nestable, .type.u.enum_nestable.desc = &dt_enum_desc, @@ -146,21 +144,21 @@ static const struct lttng_event_field dt_enum_field = { .nowrite = 0, }; -const struct lttng_event_field *lttng_ust_dynamic_type_field(int64_t value) +const 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, const 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) +const struct lttng_ust_event_field *lttng_ust_dynamic_type_tag_field(void) { return &dt_enum_field; }