From 46df6b28f5437bb7c69bede3b09758c45d9440fd Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 8 Feb 2016 03:24:13 -0500 Subject: [PATCH] ir: rename bt_ctf_node -> bt_ctf_scope MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit "scope" is more conforming to the CTF nomenclature than "node". Note that this changes the Babeltrace 1.x API, but this API is expected to be hidden from the user starting from Babeltrace 2. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- bindings/python/nativebt.i | 6 +- bindings/python/python-complements.c | 2 +- bindings/python/python-complements.h | 2 +- doc/API.txt | 2 +- formats/ctf/events.c | 6 +- formats/ctf/ir/field-path.c | 6 +- formats/ctf/ir/resolve.c | 109 +++++++++--------- include/babeltrace/ctf-ir/event-types.h | 24 ++-- .../babeltrace/ctf-ir/field-path-internal.h | 2 +- include/babeltrace/ctf-ir/field-path.h | 2 +- include/babeltrace/ctf/events.h | 8 +- tests/lib/test_bt_ctf_field_type_validation.c | 86 +++++++------- 12 files changed, 127 insertions(+), 128 deletions(-) diff --git a/bindings/python/nativebt.i b/bindings/python/nativebt.i index c5b00c9e..368952b3 100644 --- a/bindings/python/nativebt.i +++ b/bindings/python/nativebt.i @@ -74,7 +74,7 @@ struct bt_ctf_event_decl *_bt_python_decl_one_from_list( struct bt_ctf_event_decl **list, int index); struct bt_ctf_field_decl **_by_python_field_decl_listcaller( struct bt_ctf_event_decl *event_decl, - enum bt_ctf_scope scope, + enum ctf_scope scope, unsigned int *OUTPUT); struct bt_ctf_field_decl *_bt_python_field_decl_one_from_list( struct bt_ctf_field_decl **list, int index); @@ -240,7 +240,7 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter); /* events.h */ %rename("_bt_ctf_get_top_level_scope") bt_ctf_get_top_level_scope(const struct - bt_ctf_event *event, enum bt_ctf_scope scope); + bt_ctf_event *event, enum ctf_scope scope); %rename("_bt_ctf_event_name") bt_ctf_event_name(const struct bt_ctf_event *ctf_event); %rename("_bt_ctf_get_timestamp") bt_ctf_get_timestamp( const struct bt_ctf_event *ctf_event, int64_t *OUTPUT); @@ -287,7 +287,7 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter); %rename("_bt_ctf_get_struct_field_index") bt_ctf_get_struct_field_index(const struct bt_definition *structure, uint64_t i); const struct bt_definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event, - enum bt_ctf_scope scope); + enum ctf_scope scope); const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event); int bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event, int64_t *OUTPUT); uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event); diff --git a/bindings/python/python-complements.c b/bindings/python/python-complements.c index a962b804..b916b58c 100644 --- a/bindings/python/python-complements.c +++ b/bindings/python/python-complements.c @@ -89,7 +89,7 @@ struct bt_ctf_event_decl *_bt_python_decl_one_from_list( /* decl_fields */ struct bt_ctf_field_decl **_by_python_field_decl_listcaller( struct bt_ctf_event_decl *event_decl, - enum bt_ctf_scope scope, + enum ctf_scope scope, unsigned int *len) { struct bt_ctf_field_decl **list; diff --git a/bindings/python/python-complements.h b/bindings/python/python-complements.h index c243160c..0cfcc9c3 100644 --- a/bindings/python/python-complements.h +++ b/bindings/python/python-complements.h @@ -55,7 +55,7 @@ struct bt_ctf_event_decl *_bt_python_decl_one_from_list( /* decl_fields */ struct bt_ctf_field_decl **_by_python_field_decl_listcaller( struct bt_ctf_event_decl *event_decl, - enum bt_ctf_scope scope, + enum ctf_scope scope, unsigned int *len); struct bt_ctf_field_decl *_bt_python_field_decl_one_from_list( struct bt_ctf_field_decl **list, int index); diff --git a/doc/API.txt b/doc/API.txt index e13e6adf..918c3536 100644 --- a/doc/API.txt +++ b/doc/API.txt @@ -123,7 +123,7 @@ CTF event : written in the packet (in cycles). The payload of an event is divided in various scopes depending on the type of -information. There are six top-level scopes (defined in the bt_ctf_scope enum) +information. There are six top-level scopes (defined in the ctf_scope enum) which can be accessed by the bt_ctf_get_top_level_scope() function : BT_TRACE_PACKET_HEADER = 0, BT_STREAM_PACKET_CONTEXT = 1, diff --git a/formats/ctf/events.c b/formats/ctf/events.c index f336dd88..d8e8d5dd 100644 --- a/formats/ctf/events.c +++ b/formats/ctf/events.c @@ -47,7 +47,7 @@ __thread int bt_ctf_last_field_error = 0; const struct bt_definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event, - enum bt_ctf_scope scope) + enum ctf_scope scope) { const struct bt_definition *tmp = NULL; const struct ctf_event_definition *event; @@ -479,7 +479,7 @@ const char *bt_ctf_get_enum_str(const struct bt_definition *field) g_array_unref(array); bt_ctf_field_set_error(-ENOENT); return NULL; - } + } /* Return first string. Arbitrary choice. */ ret = g_quark_to_string(g_array_index(array, GQuark, 0)); g_array_unref(array); @@ -722,7 +722,7 @@ uint64_t bt_ctf_get_decl_event_id(const struct bt_ctf_event_decl *event) } int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl, - enum bt_ctf_scope scope, + enum ctf_scope scope, struct bt_ctf_field_decl const * const **list, unsigned int *count) { diff --git a/formats/ctf/ir/field-path.c b/formats/ctf/ir/field-path.c index 183a8579..67a90b48 100644 --- a/formats/ctf/ir/field-path.c +++ b/formats/ctf/ir/field-path.c @@ -57,7 +57,7 @@ struct bt_ctf_field_path *bt_ctf_field_path_create(void) } bt_object_init(field_path, field_path_destroy); - field_path->root = CTF_NODE_UNKNOWN; + field_path->root = BT_CTF_SCOPE_UNKNOWN; field_path->indexes = g_array_new(TRUE, FALSE, sizeof(int)); if (!field_path->indexes) { goto error; @@ -96,10 +96,10 @@ end: return new_path; } -enum bt_ctf_node bt_ctf_field_path_get_root( +enum bt_ctf_scope bt_ctf_field_path_get_root( const struct bt_ctf_field_path *field_path) { - enum bt_ctf_scope scope = CTF_NODE_UNKNOWN; + enum bt_ctf_scope scope = BT_CTF_SCOPE_UNKNOWN; if (!field_path) { goto end; diff --git a/formats/ctf/ir/resolve.c b/formats/ctf/ir/resolve.c index 330bf81e..c9a56b79 100644 --- a/formats/ctf/ir/resolve.c +++ b/formats/ctf/ir/resolve.c @@ -77,32 +77,32 @@ struct resolve_context { struct bt_value *environment; struct bt_ctf_field_type *scopes[6]; - /* Root node being visited */ - enum bt_ctf_node root_node; + /* Root scope being visited */ + enum bt_ctf_scope root_scope; type_stack *type_stack; struct bt_ctf_field_type *cur_field_type; }; /* TSDL dynamic scope prefixes as defined in CTF Section 7.3.2 */ static const char * const absolute_path_prefixes[] = { - [CTF_NODE_ENV] = "env.", - [CTF_NODE_TRACE_PACKET_HEADER] = "trace.packet.header.", - [CTF_NODE_STREAM_PACKET_CONTEXT] = "stream.packet.context.", - [CTF_NODE_STREAM_EVENT_HEADER] = "stream.event.header.", - [CTF_NODE_STREAM_EVENT_CONTEXT] = "stream.event.context.", - [CTF_NODE_EVENT_CONTEXT] = "event.context.", - [CTF_NODE_EVENT_FIELDS] = "event.fields.", + [BT_CTF_SCOPE_ENV] = "env.", + [BT_CTF_SCOPE_TRACE_PACKET_HEADER] = "trace.packet.header.", + [BT_CTF_SCOPE_STREAM_PACKET_CONTEXT] = "stream.packet.context.", + [BT_CTF_SCOPE_STREAM_EVENT_HEADER] = "stream.event.header.", + [BT_CTF_SCOPE_STREAM_EVENT_CONTEXT] = "stream.event.context.", + [BT_CTF_SCOPE_EVENT_CONTEXT] = "event.context.", + [BT_CTF_SCOPE_EVENT_FIELDS] = "event.fields.", }; /* Number of path tokens used for the absolute prefixes */ static const int absolute_path_prefix_ptoken_counts[] = { - [CTF_NODE_ENV] = 1, - [CTF_NODE_TRACE_PACKET_HEADER] = 3, - [CTF_NODE_STREAM_PACKET_CONTEXT] = 3, - [CTF_NODE_STREAM_EVENT_HEADER] = 3, - [CTF_NODE_STREAM_EVENT_CONTEXT] = 3, - [CTF_NODE_EVENT_CONTEXT] = 2, - [CTF_NODE_EVENT_FIELDS] = 2, + [BT_CTF_SCOPE_ENV] = 1, + [BT_CTF_SCOPE_TRACE_PACKET_HEADER] = 3, + [BT_CTF_SCOPE_STREAM_PACKET_CONTEXT] = 3, + [BT_CTF_SCOPE_STREAM_EVENT_HEADER] = 3, + [BT_CTF_SCOPE_STREAM_EVENT_CONTEXT] = 3, + [BT_CTF_SCOPE_EVENT_CONTEXT] = 2, + [BT_CTF_SCOPE_EVENT_FIELDS] = 2, }; /* @@ -246,12 +246,12 @@ void type_stack_pop(type_stack *stack) */ static struct bt_ctf_field_type *get_type_from_ctx(struct resolve_context *ctx, - enum bt_ctf_node node) + enum bt_ctf_scope scope) { - assert(node >= CTF_NODE_TRACE_PACKET_HEADER && - node <= CTF_NODE_EVENT_FIELDS); + assert(scope >= BT_CTF_SCOPE_TRACE_PACKET_HEADER && + scope <= BT_CTF_SCOPE_EVENT_FIELDS); - return ctx->scopes[node - CTF_NODE_TRACE_PACKET_HEADER]; + return ctx->scopes[scope - BT_CTF_SCOPE_TRACE_PACKET_HEADER]; } /* @@ -259,29 +259,29 @@ struct bt_ctf_field_type *get_type_from_ctx(struct resolve_context *ctx, * CTF_NODE_UNKNOWN if the path is found to be relative. */ static -enum bt_ctf_node get_root_node_from_absolute_pathstr(const char *pathstr) +enum bt_ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr) { - enum bt_ctf_node node; - enum bt_ctf_node ret = CTF_NODE_UNKNOWN; + enum bt_ctf_scope scope; + enum bt_ctf_scope ret = BT_CTF_SCOPE_UNKNOWN; const size_t prefixes_count = sizeof(absolute_path_prefixes) / sizeof(*absolute_path_prefixes); - for (node = CTF_NODE_ENV; node < CTF_NODE_ENV + prefixes_count; - node++) { + for (scope = BT_CTF_SCOPE_ENV; scope < BT_CTF_SCOPE_ENV + + prefixes_count; scope++) { /* * Chech if path string starts with a known absolute * path prefix. * * Refer to CTF 7.3.2 STATIC AND DYNAMIC SCOPES. */ - if (strncmp(pathstr, absolute_path_prefixes[node], - strlen(absolute_path_prefixes[node]))) { + if (strncmp(pathstr, absolute_path_prefixes[scope], + strlen(absolute_path_prefixes[scope]))) { /* Prefix does not match: try the next one */ continue; } /* Found it! */ - ret = node; + ret = scope; goto end; } @@ -470,7 +470,7 @@ int absolute_ptokens_to_field_path(GList *ptokens, type = get_type_from_ctx(ctx, field_path->root); if (!type) { /* Error: root type is not available */ - _printf_error("Root type with node type %d is not available\n", + _printf_error("Root type with scope type %d is not available\n", field_path->root); ret = -1; goto end; @@ -559,7 +559,7 @@ int relative_ptokens_to_field_path(GList *ptokens, /* Not found: look in previous scopes */ field_path->root--; - while (field_path->root >= CTF_NODE_TRACE_PACKET_HEADER) { + while (field_path->root >= BT_CTF_SCOPE_TRACE_PACKET_HEADER) { struct bt_ctf_field_type *root_type; bt_ctf_field_path_clear(field_path); @@ -599,7 +599,7 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr, struct resolve_context *ctx) { int ret; - enum bt_ctf_node root_node; + enum bt_ctf_scope root_scope; GList *ptokens = NULL; struct bt_ctf_field_path *field_path = NULL; @@ -621,31 +621,31 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr, } /* Absolute or relative path? */ - root_node = get_root_node_from_absolute_pathstr(pathstr); + root_scope = get_root_scope_from_absolute_pathstr(pathstr); - if (root_node == CTF_NODE_UNKNOWN) { - /* Relative path: start with current root node */ - field_path->root = ctx->root_node; + if (root_scope == BT_CTF_SCOPE_UNKNOWN) { + /* Relative path: start with current root scope */ + field_path->root = ctx->root_scope; ret = relative_ptokens_to_field_path(ptokens, field_path, ctx); if (ret) { _printf_error("Cannot get relative field path of path string \"%s\"\n", pathstr); - _printf_error(" Starting at root node %d, finished at root node %d\n", - ctx->root_node, field_path->root); + _printf_error(" Starting at root scope %d, finished at root scope %d\n", + ctx->root_scope, field_path->root); goto end; } - } else if (root_node == CTF_NODE_ENV) { + } else if (root_scope == BT_CTF_SCOPE_ENV) { _printf_error("Sequence field types referring the trace environment are not supported as of this version\n"); ret = -1; goto end; } else { - /* Absolute path: use found root node */ - field_path->root = root_node; + /* Absolute path: use found root scope */ + field_path->root = root_scope; ret = absolute_ptokens_to_field_path(ptokens, field_path, ctx); if (ret) { _printf_error("Cannot get absolute field path of path string \"%s\"\n", pathstr); - _printf_error(" Looking in root node %d\n", root_node); + _printf_error(" Looking in root scope %d\n", root_scope); goto end; } } @@ -679,7 +679,7 @@ struct bt_ctf_field_type *field_path_to_field_type( bt_get(type); if (!type) { /* Error: root type is not available */ - _printf_error("Root type with node type %d is not available\n", + _printf_error("Root type with scope type %d is not available\n", field_path->root); goto error; } @@ -728,7 +728,7 @@ struct bt_ctf_field_path *get_ctx_stack_field_path(struct resolve_context *ctx) goto error; } - field_path->root = ctx->root_node; + field_path->root = ctx->root_scope; for (i = 0; i < type_stack_size(ctx->type_stack); i++) { struct type_stack_frame *frame; @@ -1085,14 +1085,14 @@ end: * Resolves the root field type corresponding to the scope `root_scope`. */ static -int resolve_root_type(enum ctf_type_id root_node, struct resolve_context *ctx) +int resolve_root_type(enum ctf_type_id root_scope, struct resolve_context *ctx) { int ret; assert(type_stack_size(ctx->type_stack) == 0); - ctx->root_node = root_node; - ret = resolve_type(get_type_from_ctx(ctx, root_node), ctx); - ctx->root_node = CTF_NODE_UNKNOWN; + ctx->root_scope = root_scope; + ret = resolve_type(get_type_from_ctx(ctx, root_scope), ctx); + ctx->root_scope = BT_CTF_SCOPE_UNKNOWN; return ret; } @@ -1119,7 +1119,7 @@ int bt_ctf_resolve_types( event_context_type, event_payload_type, }, - .root_node = CTF_NODE_UNKNOWN, + .root_scope = BT_CTF_SCOPE_UNKNOWN, }; /* Initialize type stack */ @@ -1132,7 +1132,7 @@ int bt_ctf_resolve_types( /* Resolve packet header type */ if (flags & BT_CTF_RESOLVE_FLAG_PACKET_HEADER) { - ret = resolve_root_type(CTF_NODE_TRACE_PACKET_HEADER, &ctx); + ret = resolve_root_type(BT_CTF_SCOPE_TRACE_PACKET_HEADER, &ctx); if (ret) { _printf_error("Cannot resolve trace packet header type\n"); goto end; @@ -1141,7 +1141,7 @@ int bt_ctf_resolve_types( /* Resolve packet context type */ if (flags & BT_CTF_RESOLVE_FLAG_PACKET_CONTEXT) { - ret = resolve_root_type(CTF_NODE_STREAM_PACKET_CONTEXT, &ctx); + ret = resolve_root_type(BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, &ctx); if (ret) { _printf_error("Cannot resolve stream packet context type\n"); goto end; @@ -1150,8 +1150,7 @@ int bt_ctf_resolve_types( /* Resolve event header type */ if (flags & BT_CTF_RESOLVE_FLAG_EVENT_HEADER) { - ret = resolve_root_type(CTF_NODE_STREAM_EVENT_HEADER, &ctx); - + ret = resolve_root_type(BT_CTF_SCOPE_STREAM_EVENT_HEADER, &ctx); if (ret) { _printf_error("Cannot resolve stream event header type\n"); goto end; @@ -1160,7 +1159,7 @@ int bt_ctf_resolve_types( /* Resolve stream event context type */ if (flags & BT_CTF_RESOLVE_FLAG_STREAM_EVENT_CTX) { - ret = resolve_root_type(CTF_NODE_STREAM_EVENT_CONTEXT, &ctx); + ret = resolve_root_type(BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, &ctx); if (ret) { _printf_error("Cannot resolve stream event context type\n"); goto end; @@ -1169,7 +1168,7 @@ int bt_ctf_resolve_types( /* Resolve event context type */ if (flags & BT_CTF_RESOLVE_FLAG_EVENT_CONTEXT) { - ret = resolve_root_type(CTF_NODE_EVENT_CONTEXT, &ctx); + ret = resolve_root_type(BT_CTF_SCOPE_EVENT_CONTEXT, &ctx); if (ret) { _printf_error("Cannot resolve event context type\n"); goto end; @@ -1178,7 +1177,7 @@ int bt_ctf_resolve_types( /* Resolve event payload type */ if (flags & BT_CTF_RESOLVE_FLAG_EVENT_PAYLOAD) { - ret = resolve_root_type(CTF_NODE_EVENT_FIELDS, &ctx); + ret = resolve_root_type(BT_CTF_SCOPE_EVENT_FIELDS, &ctx); if (ret) { _printf_error("Cannot resolve event payload type\n"); goto end; diff --git a/include/babeltrace/ctf-ir/event-types.h b/include/babeltrace/ctf-ir/event-types.h index 2bffe88a..a07d5e56 100644 --- a/include/babeltrace/ctf-ir/event-types.h +++ b/include/babeltrace/ctf-ir/event-types.h @@ -54,9 +54,9 @@ enum bt_ctf_integer_base { enum bt_ctf_byte_order { BT_CTF_BYTE_ORDER_UNKNOWN = -1, /* - * Note that native, in the context of the CTF specification, is defined as - * "the byte order described in the trace" and does not mean that the host's - * endianness will be used. + * Note that native, in the context of the CTF specification, is defined + * as "the byte order described in the trace" and does not mean that the + * host's endianness will be used. */ BT_CTF_BYTE_ORDER_NATIVE = 0, BT_CTF_BYTE_ORDER_LITTLE_ENDIAN, @@ -64,15 +64,15 @@ enum bt_ctf_byte_order { BT_CTF_BYTE_ORDER_NETWORK, }; -enum bt_ctf_node { - CTF_NODE_UNKNOWN = -1, - CTF_NODE_ENV = 0, - CTF_NODE_TRACE_PACKET_HEADER = 1, - CTF_NODE_STREAM_PACKET_CONTEXT = 2, - CTF_NODE_STREAM_EVENT_HEADER = 3, - CTF_NODE_STREAM_EVENT_CONTEXT = 4, - CTF_NODE_EVENT_CONTEXT = 5, - CTF_NODE_EVENT_FIELDS = 6, +enum bt_ctf_scope { + BT_CTF_SCOPE_UNKNOWN = -1, + BT_CTF_SCOPE_ENV = 0, + BT_CTF_SCOPE_TRACE_PACKET_HEADER = 1, + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT = 2, + BT_CTF_SCOPE_STREAM_EVENT_HEADER = 3, + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT = 4, + BT_CTF_SCOPE_EVENT_CONTEXT = 5, + BT_CTF_SCOPE_EVENT_FIELDS = 6, }; /* diff --git a/include/babeltrace/ctf-ir/field-path-internal.h b/include/babeltrace/ctf-ir/field-path-internal.h index 8abe0e3c..de08a87e 100644 --- a/include/babeltrace/ctf-ir/field-path-internal.h +++ b/include/babeltrace/ctf-ir/field-path-internal.h @@ -33,7 +33,7 @@ struct bt_ctf_field_path { struct bt_object base; - enum bt_ctf_node root; + enum bt_ctf_scope root; /* * Array of integers (int) indicating the index in either diff --git a/include/babeltrace/ctf-ir/field-path.h b/include/babeltrace/ctf-ir/field-path.h index 443bf39c..5a0ec2af 100644 --- a/include/babeltrace/ctf-ir/field-path.h +++ b/include/babeltrace/ctf-ir/field-path.h @@ -45,7 +45,7 @@ struct bt_ctf_field_path; * * Returns the root node of a field path, or BT_CTF_SCOPE_UNKNOWN on error. */ -extern enum bt_ctf_node bt_ctf_field_path_get_root( +extern enum bt_ctf_scope bt_ctf_field_path_get_root( const struct bt_ctf_field_path *field_path); /* diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h index a8764707..eb238f40 100644 --- a/include/babeltrace/ctf/events.h +++ b/include/babeltrace/ctf/events.h @@ -48,7 +48,7 @@ struct bt_ctf_field_decl; /* * the top-level scopes in CTF */ -enum bt_ctf_scope { +enum ctf_scope { BT_TRACE_PACKET_HEADER = 0, BT_STREAM_PACKET_CONTEXT = 1, BT_STREAM_EVENT_HEADER = 2, @@ -87,7 +87,7 @@ enum ctf_string_encoding { /* * bt_ctf_get_top_level_scope: return a definition of the top-level scope * - * Top-level scopes are defined in the bt_ctf_scope enum. + * Top-level scopes are defined in the ctf_scope enum. * In order to get a field or a field list, the user needs to pass a * scope as argument, this scope can be a top-level scope or a scope * relative to an arbitrary field. This function provides the mapping @@ -95,7 +95,7 @@ enum ctf_string_encoding { * On error return NULL. */ const struct bt_definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *event, - enum bt_ctf_scope scope); + enum ctf_scope scope); /* * bt_ctf_event_get_name: returns the name of the event or NULL on error @@ -289,7 +289,7 @@ uint64_t bt_ctf_get_decl_event_id(const struct bt_ctf_event_decl *event); * valid as long as the trace is opened. */ int bt_ctf_get_decl_fields(struct bt_ctf_event_decl *event_decl, - enum bt_ctf_scope scope, + enum ctf_scope scope, struct bt_ctf_field_decl const * const **list, unsigned int *count); diff --git a/tests/lib/test_bt_ctf_field_type_validation.c b/tests/lib/test_bt_ctf_field_type_validation.c index e114eae2..0e8b0788 100644 --- a/tests/lib/test_bt_ctf_field_type_validation.c +++ b/tests/lib/test_bt_ctf_field_type_validation.c @@ -1638,7 +1638,7 @@ end: static int validate_field_path(struct bt_ctf_field_type *field_type, - enum bt_ctf_node root, ...) + enum bt_ctf_scope root, ...) { int ret = 0; int len; @@ -1736,7 +1736,7 @@ void validate_test_pass(struct bt_ctf_trace *trace) /* trace.packet.header.iron.fire.keen */ ft_src = get_ft(ph, "iron", "fire", "keen", NULL); - ok(!validate_field_path(ft_src, CTF_NODE_TRACE_PACKET_HEADER, + ok(!validate_field_path(ft_src, BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), "trace.packet.header.iron.fire.keen has the correct field path"); BT_PUT(ft_src); @@ -1744,7 +1744,7 @@ void validate_test_pass(struct bt_ctf_trace *trace) /* trace.packet.header.iron.fire.keen.[element] */ ft_src = get_ft(ph, "iron", "fire", "keen", "", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), "trace.packet.header.iron.fire.keen.[element] has the correct field path"); ft_target = get_ft(ph, "iron", "parallel", NULL); ft_tag = bt_ctf_field_type_variant_get_tag_type(ft_src); @@ -1757,35 +1757,35 @@ void validate_test_pass(struct bt_ctf_trace *trace) /* trace.packet.header.iron.fire.keen.[element].BLUE */ ft_src = get_ft(ph, "iron", "fire", "keen", "", "BLUE", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 0, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 0, FIELD_PATH_END), "trace.packet.header.iron.fire.keen.[element].BLUE has the correct field path"); BT_PUT(ft_src); /* trace.packet.header.iron.report */ ft_src = get_ft(ph, "iron", "report", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), "trace.packet.header.iron.report has the correct field path"); BT_PUT(ft_src); /* trace.packet.header.iron.group */ ft_src = get_ft(ph, "iron", "group", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 2, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 2, FIELD_PATH_END), "trace.packet.header.iron.group has the correct field path"); BT_PUT(ft_src); /* stream.packet.context.naive.[element] */ ft_src = get_ft(pc, "naive", "", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), "stream.packet.context.naive.[element] has the correct field path"); BT_PUT(ft_src); /* stream.packet.context.clover.whole */ ft_src = get_ft(pc, "clover", "whole", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), "stream.packet.context.clover.whole has the correct field path"); ft_target = get_ft(ph, "iron", "parallel", NULL); ft_tag = bt_ctf_field_type_variant_get_tag_type(ft_src); @@ -1798,245 +1798,245 @@ void validate_test_pass(struct bt_ctf_trace *trace) /* stream.packet.context.clover.whole.BLUE */ ft_src = get_ft(pc, "clover", "whole", "BLUE", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), "stream.packet.context.clover.whole.BLUE has the correct field path"); BT_PUT(ft_src); /* stream.packet.context.clover.egg */ ft_src = get_ft(pc, "clover", "egg", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), "stream.packet.context.clover.egg has the correct field path"); BT_PUT(ft_src); /* stream.packet.context.clover.useful */ ft_src = get_ft(pc, "clover", "useful", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), "stream.packet.context.clover.useful has the correct field path"); BT_PUT(ft_src); /* stream.event.header.action.lucky */ ft_src = get_ft(eh, "action", "lucky", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), "stream.event.header.action.lucky has the correct field path"); BT_PUT(ft_src); /* stream.event.header.stiff */ ft_src = get_ft(eh, "stiff", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 4, 1, 1, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 4, 1, 1, FIELD_PATH_END), "stream.event.header.stiff has the correct field path"); BT_PUT(ft_src); /* stream.event.header.fruit.apple */ ft_src = get_ft(eh, "fruit", "apple", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), "stream.event.header.fruit.apple has the correct field path"); BT_PUT(ft_src); /* stream.event.context.face.branch */ ft_src = get_ft(sec, "face", "branch", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), "stream.event.context.face.branch has the correct field path"); BT_PUT(ft_src); /* stream.event.context.face.income */ ft_src = get_ft(sec, "face", "income", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 0, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 0, FIELD_PATH_END), "stream.event.context.face.income has the correct field path"); BT_PUT(ft_src); /* stream.event.context.face.lucky */ ft_src = get_ft(sec, "face", "lucky", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "stream.event.context.face.lucky has the correct field path"); BT_PUT(ft_src); /* stream.event.context.dream */ ft_src = get_ft(sec, "dream", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 0, FIELD_PATH_END), "stream.event.context.dream has the correct field path"); BT_PUT(ft_src); /* stream.event.context.dream.[element] */ ft_src = get_ft(sec, "dream", "", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), "stream.event.context.dream.[element] has the correct field path"); BT_PUT(ft_src); /* stream.event.context.dream.[element].[element] */ ft_src = get_ft(sec, "dream", "", "", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "stream.event.context.dream.[element].[element] has the correct field path"); BT_PUT(ft_src); /* event.context.berry.porter */ ft_src = get_ft(ectx, "berry", "porter", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "event.context.berry.porter has the correct field path"); BT_PUT(ft_src); /* event.context.berry.porter */ ft_src = get_ft(ectx, "berry", "porter", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "event.context.berry.porter has the correct field path"); BT_PUT(ft_src); /* event.context.berry.mice */ ft_src = get_ft(ectx, "berry", "mice", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), "event.context.berry.mice has the correct field path"); BT_PUT(ft_src); /* event.context.berry.guard */ ft_src = get_ft(ectx, "berry", "guard", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), "event.context.berry.guard has the correct field path"); BT_PUT(ft_src); /* event.context.berry.one */ ft_src = get_ft(ectx, "berry", "one", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), "event.context.berry.one has the correct field path"); BT_PUT(ft_src); /* event.context.loud.toys */ ft_src = get_ft(ectx, "loud", "toys", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 3, 0, FIELD_PATH_END), "event.context.loud.toys has the correct field path"); BT_PUT(ft_src); /* event.context.loud.spoon */ ft_src = get_ft(ectx, "loud", "spoon", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 4, 0, FIELD_PATH_END), "event.context.loud.spoon has the correct field path"); BT_PUT(ft_src); /* event.context.loud.turkey */ ft_src = get_ft(ectx, "loud", "turkey", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_HEADER, 2, 0, FIELD_PATH_END), "event.context.loud.turkey has the correct field path"); BT_PUT(ft_src); /* event.context.loud.inform */ ft_src = get_ft(ectx, "loud", "inform", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "event.context.loud.inform has the correct field path"); BT_PUT(ft_src); /* event.context.loud.odd */ ft_src = get_ft(ectx, "loud", "odd", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), "event.context.loud.odd has the correct field path"); BT_PUT(ft_src); /* event.context.loud.amuck */ ft_src = get_ft(ectx, "loud", "amuck", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_CONTEXT, 0, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_CONTEXT, 0, FIELD_PATH_END), "event.context.loud.amuck has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.equal */ ft_src = get_ft(ep, "relative", "equal", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_FIELDS, 0, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_FIELDS, 0, FIELD_PATH_END), "event.fields.relative.equal has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.amuck */ ft_src = get_ft(ep, "relative", "amuck", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_HEADER, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_HEADER, 0, FIELD_PATH_END), "event.fields.relative.amuck has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.push */ ft_src = get_ft(ep, "relative", "push", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), "event.fields.relative.push has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.brick */ ft_src = get_ft(ep, "relative", "brick", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "event.fields.relative.brick has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.crush */ ft_src = get_ft(ep, "relative", "crush", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), "event.fields.relative.crush has the correct field path"); BT_PUT(ft_src); /* event.fields.relative.canvas */ ft_src = get_ft(ep, "relative", "canvas", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), "event.fields.relative.canvas has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.equal */ ft_src = get_ft(ep, "absolute", "equal", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_FIELDS, 0, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_FIELDS, 0, FIELD_PATH_END), "event.fields.absolute.equal has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.amuck */ ft_src = get_ft(ep, "absolute", "amuck", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_HEADER, 0, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_HEADER, 0, FIELD_PATH_END), "event.fields.absolute.amuck has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.push */ ft_src = get_ft(ep, "absolute", "push", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), + BT_CTF_SCOPE_EVENT_CONTEXT, 1, 3, FIELD_PATH_END), "event.fields.absolute.push has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.brick */ ft_src = get_ft(ep, "absolute", "brick", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_EVENT_CONTEXT, 0, 2, FIELD_PATH_END), "event.fields.absolute.brick has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.crush */ ft_src = get_ft(ep, "absolute", "crush", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), + BT_CTF_SCOPE_STREAM_PACKET_CONTEXT, 2, FIELD_PATH_END), "event.fields.absolute.crush has the correct field path"); BT_PUT(ft_src); /* event.fields.absolute.canvas */ ft_src = get_ft(ep, "absolute", "canvas", NULL); ok(!validate_field_path(ft_src, - CTF_NODE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), + BT_CTF_SCOPE_TRACE_PACKET_HEADER, 3, 1, FIELD_PATH_END), "event.fields.absolute.canvas has the correct field path"); BT_PUT(ft_src); -- 2.34.1