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,
};
/*
*/
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];
}
/*
* 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;
}
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;
/* 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);
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;
}
/* 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;
}
}
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;
}
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;
* 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;
}
event_context_type,
event_payload_type,
},
- .root_node = CTF_NODE_UNKNOWN,
+ .root_scope = BT_CTF_SCOPE_UNKNOWN,
};
/* Initialize type stack */
/* 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;
/* 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;
/* 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;
/* 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;
/* 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;
/* 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;
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;
/* 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);
/* 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);
/* 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);
/* 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);