Rename VERBOSE log level to TRACE
[babeltrace.git] / src / plugins / ctf / common / metadata / ctf-meta-resolve.c
index 17bfcf36e37fbe786460adb9a7b3aabe46135bb4..05b67e93e5310f6e121127a2db9d590224f1d193 100644 (file)
  * all copies or substantial portions of the Software.
  */
 
+#define BT_COMP_LOG_SELF_COMP (ctx->self_comp)
+#define BT_LOG_OUTPUT_LEVEL (ctx->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/RESOLVE"
-#include "logging.h"
+#include "plugins/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"
@@ -29,6 +31,7 @@
 #include <glib.h>
 
 #include "ctf-meta-visitors.h"
+#include "logging.h"
 
 typedef GPtrArray field_class_stack;
 
@@ -50,6 +53,8 @@ struct field_class_stack_frame {
  * The current context of the resolving engine.
  */
 struct resolve_context {
+       bt_logging_level log_level;
+       bt_self_component *self_comp;
        struct ctf_trace_class *tc;
        struct ctf_stream_class *sc;
        struct ctf_event_class *ec;
@@ -124,25 +129,26 @@ void field_class_stack_destroy(field_class_stack *stack)
  * Pushes a field class onto a class stack.
  */
 static
-int field_class_stack_push(field_class_stack *stack, struct ctf_field_class *fc)
+int field_class_stack_push(field_class_stack *stack, struct ctf_field_class *fc,
+               struct resolve_context *ctx)
 {
        int ret = 0;
        struct field_class_stack_frame *frame = NULL;
 
        if (!stack || !fc) {
-               BT_LOGE("Invalid parameter: stack or field class is NULL.");
+               BT_COMP_LOGE("Invalid parameter: stack or field class is NULL.");
                ret = -1;
                goto end;
        }
 
        frame = g_new0(struct field_class_stack_frame, 1);
        if (!frame) {
-               BT_LOGE_STR("Failed to allocate one field class stack frame.");
+               BT_COMP_LOGE_STR("Failed to allocate one field class stack frame.");
                ret = -1;
                goto end;
        }
 
-       BT_LOGD("Pushing field class on context's stack: "
+       BT_COMP_LOGD("Pushing field class on context's stack: "
                "fc-addr=%p, stack-size-before=%u", fc, stack->len);
        frame->fc = fc;
        g_ptr_array_add(stack, frame);
@@ -209,14 +215,15 @@ end:
  * Removes the top frame of `stack`.
  */
 static
-void field_class_stack_pop(field_class_stack *stack)
+void field_class_stack_pop(field_class_stack *stack,
+               struct resolve_context *ctx)
 {
        if (!field_class_stack_empty(stack)) {
                /*
                 * This will call the frame's destructor and free it, as
                 * well as put its contained field class.
                 */
-               BT_LOGD("Popping context's stack: stack-size-before=%u",
+               BT_COMP_LOGD("Popping context's stack: stack-size-before=%u",
                        stack->len);
                g_ptr_array_set_size(stack, stack->len - 1);
        }
@@ -254,7 +261,8 @@ struct ctf_field_class *borrow_class_from_ctx(struct resolve_context *ctx,
  * is found to be relative.
  */
 static
-enum ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr)
+enum ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr,
+               struct resolve_context *ctx)
 {
        enum ctf_scope scope;
        enum ctf_scope ret = -1;
@@ -272,7 +280,7 @@ enum ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr)
                if (strncmp(pathstr, absolute_path_prefixes[scope],
                                strlen(absolute_path_prefixes[scope]))) {
                        /* Prefix does not match: try the next one */
-                       BT_LOGD("Prefix does not match: trying the next one: "
+                       BT_COMP_LOGD("Prefix does not match: trying the next one: "
                                "path=\"%s\", path-prefix=\"%s\", scope=%s",
                                pathstr, absolute_path_prefixes[scope],
                                ctf_scope_string(scope));
@@ -281,7 +289,7 @@ enum ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr)
 
                /* Found it! */
                ret = scope;
-               BT_LOGD("Found root scope from absolute path: "
+               BT_COMP_LOGD("Found root scope from absolute path: "
                        "path=\"%s\", scope=%s", pathstr,
                        ctf_scope_string(scope));
                goto end;
@@ -331,7 +339,7 @@ const char *ptoken_get_string(GList *ptoken)
  * strings.
  */
 static
-GList *pathstr_to_ptokens(const char *pathstr)
+GList *pathstr_to_ptokens(const char *pathstr, struct resolve_context *ctx)
 {
        const char *at = pathstr;
        const char *last = at;
@@ -343,7 +351,7 @@ GList *pathstr_to_ptokens(const char *pathstr)
 
                        if (at == last) {
                                /* Error: empty token */
-                               BT_LOGE("Empty path token: path=\"%s\", pos=%u",
+                               BT_COMP_LOGE("Empty path token: path=\"%s\", pos=%u",
                                        pathstr, (unsigned int) (at - pathstr));
                                goto error;
                        }
@@ -379,7 +387,8 @@ error:
  */
 static
 int ptokens_to_field_path(GList *ptokens, struct ctf_field_path *field_path,
-               struct ctf_field_class *fc, int64_t src_index)
+               struct ctf_field_class *fc, int64_t src_index,
+               struct resolve_context *ctx)
 {
        int ret = 0;
        GList *cur_ptoken = ptokens;
@@ -391,7 +400,7 @@ int ptokens_to_field_path(GList *ptokens, struct ctf_field_path *field_path,
                struct ctf_field_class *child_fc;
                const char *ft_name = ptoken_get_string(cur_ptoken);
 
-               BT_LOGD("Current path token: token=\"%s\"", ft_name);
+               BT_COMP_LOGD("Current path token: token=\"%s\"", ft_name);
 
                /* Find to which index corresponds the current path token */
                if (fc->type == CTF_FIELD_CLASS_TYPE_ARRAY ||
@@ -406,7 +415,7 @@ int ptokens_to_field_path(GList *ptokens, struct ctf_field_path *field_path,
                                 * Error: field name does not exist or
                                 * wrong current class.
                                 */
-                               BT_LOGD("Cannot get index of field class: "
+                               BT_COMP_LOGD("Cannot get index of field class: "
                                        "field-name=\"%s\", "
                                        "src-index=%" PRId64 ", "
                                        "child-index=%" PRId64 ", "
@@ -417,7 +426,7 @@ int ptokens_to_field_path(GList *ptokens, struct ctf_field_path *field_path,
                                goto end;
                        } else if (child_index > src_index &&
                                        !first_level_done) {
-                               BT_LOGD("Child field class is located after source field class: "
+                               BT_COMP_LOGD("Child field class is located after source field class: "
                                        "field-name=\"%s\", "
                                        "src-index=%" PRId64 ", "
                                        "child-index=%" PRId64 ", "
@@ -472,7 +481,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
        switch (field_path->root) {
        case CTF_SCOPE_PACKET_HEADER:
                if (ctx->tc->is_translated) {
-                       BT_LOGE("Trace class is already translated: "
+                       BT_COMP_LOGE("Trace class is already translated: "
                                "root-scope=%s",
                                ctf_scope_string(field_path->root));
                        ret = -1;
@@ -484,7 +493,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
        case CTF_SCOPE_EVENT_HEADER:
        case CTF_SCOPE_EVENT_COMMON_CONTEXT:
                if (!ctx->sc) {
-                       BT_LOGE("No current stream class: "
+                       BT_COMP_LOGE("No current stream class: "
                                "root-scope=%s",
                                ctf_scope_string(field_path->root));
                        ret = -1;
@@ -492,7 +501,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
                }
 
                if (ctx->sc->is_translated) {
-                       BT_LOGE("Stream class is already translated: "
+                       BT_COMP_LOGE("Stream class is already translated: "
                                "root-scope=%s",
                                ctf_scope_string(field_path->root));
                        ret = -1;
@@ -503,7 +512,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
        case CTF_SCOPE_EVENT_SPECIFIC_CONTEXT:
        case CTF_SCOPE_EVENT_PAYLOAD:
                if (!ctx->ec) {
-                       BT_LOGE("No current event class: "
+                       BT_COMP_LOGE("No current event class: "
                                "root-scope=%s",
                                ctf_scope_string(field_path->root));
                        ret = -1;
@@ -511,7 +520,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
                }
 
                if (ctx->ec->is_translated) {
-                       BT_LOGE("Event class is already translated: "
+                       BT_COMP_LOGE("Event class is already translated: "
                                "root-scope=%s",
                                ctf_scope_string(field_path->root));
                        ret = -1;
@@ -532,7 +541,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
        fc = borrow_class_from_ctx(ctx, field_path->root);
        if (!fc) {
                /* Error: root class is not available */
-               BT_LOGE("Root field class is not available: "
+               BT_COMP_LOGE("Root field class is not available: "
                        "root-scope=%s",
                        ctf_scope_string(field_path->root));
                ret = -1;
@@ -540,7 +549,7 @@ int absolute_ptokens_to_field_path(GList *ptokens,
        }
 
        /* Locate target */
-       ret = ptokens_to_field_path(cur_ptoken, field_path, fc, INT64_MAX);
+       ret = ptokens_to_field_path(cur_ptoken, field_path, fc, INT64_MAX, ctx);
 
 end:
        return ret;
@@ -571,17 +580,17 @@ int relative_ptokens_to_field_path(GList *ptokens,
                int64_t cur_index = field_class_stack_at(ctx->field_class_stack,
                        parent_pos_in_stack)->index;
 
-               BT_LOGD("Locating target field class from current parent field class: "
+               BT_COMP_LOGD("Locating target field class from current parent field class: "
                        "parent-pos=%" PRId64 ", parent-fc-addr=%p, "
                        "cur-index=%" PRId64,
                        parent_pos_in_stack, parent_class, cur_index);
 
                /* Locate target from current parent class */
                ret = ptokens_to_field_path(ptokens, &tail_field_path,
-                       parent_class, cur_index);
+                       parent_class, cur_index, ctx);
                if (ret) {
                        /* Not found... yet */
-                       BT_LOGD_STR("Not found at this point.");
+                       BT_COMP_LOGD_STR("Not found at this point.");
                        ctf_field_path_clear(&tail_field_path);
                } else {
                        /* Found: stitch tail field path to head field path */
@@ -641,25 +650,25 @@ int pathstr_to_field_path(const char *pathstr,
        GList *ptokens = NULL;
 
        /* Convert path string to path tokens */
-       ptokens = pathstr_to_ptokens(pathstr);
+       ptokens = pathstr_to_ptokens(pathstr, ctx);
        if (!ptokens) {
-               BT_LOGE("Cannot convert path string to path tokens: "
+               BT_COMP_LOGE("Cannot convert path string to path tokens: "
                        "path=\"%s\"", pathstr);
                ret = -1;
                goto end;
        }
 
        /* Absolute or relative path? */
-       root_scope = get_root_scope_from_absolute_pathstr(pathstr);
+       root_scope = get_root_scope_from_absolute_pathstr(pathstr, ctx);
 
        if (root_scope == -1) {
                /* Relative path: start with current root scope */
                field_path->root = ctx->root_scope;
-               BT_LOGD("Detected relative path: starting with current root scope: "
+               BT_COMP_LOGD("Detected relative path: starting with current root scope: "
                        "scope=%s", ctf_scope_string(field_path->root));
                ret = relative_ptokens_to_field_path(ptokens, field_path, ctx);
                if (ret) {
-                       BT_LOGE("Cannot get relative field path of path string: "
+                       BT_COMP_LOGE("Cannot get relative field path of path string: "
                                "path=\"%s\", start-scope=%s, end-scope=%s",
                                pathstr, ctf_scope_string(ctx->root_scope),
                                ctf_scope_string(field_path->root));
@@ -668,23 +677,23 @@ int pathstr_to_field_path(const char *pathstr,
        } else {
                /* Absolute path: use found root scope */
                field_path->root = root_scope;
-               BT_LOGD("Detected absolute path: using root scope: "
+               BT_COMP_LOGD("Detected absolute path: using root scope: "
                        "scope=%s", ctf_scope_string(field_path->root));
                ret = absolute_ptokens_to_field_path(ptokens, field_path, ctx);
                if (ret) {
-                       BT_LOGE("Cannot get absolute field path of path string: "
+                       BT_COMP_LOGE("Cannot get absolute field path of path string: "
                                "path=\"%s\", root-scope=%s",
                                pathstr, ctf_scope_string(root_scope));
                        goto end;
                }
        }
 
-       if (BT_LOG_ON_VERBOSE && ret == 0) {
+       if (BT_LOG_ON_TRACE && ret == 0) {
                GString *field_path_pretty = ctf_field_path_string(field_path);
                const char *field_path_pretty_str =
                        field_path_pretty ? field_path_pretty->str : NULL;
 
-               BT_LOGD("Found field path: path=\"%s\", field-path=\"%s\"",
+               BT_COMP_LOGD("Found field path: path=\"%s\", field-path=\"%s\"",
                        pathstr, field_path_pretty_str);
 
                if (field_path_pretty) {
@@ -712,7 +721,7 @@ struct ctf_field_class *field_path_to_field_class(
        fc = borrow_class_from_ctx(ctx, field_path->root);
        if (!fc) {
                /* Error: root class is not available */
-               BT_LOGE("Root field class is not available: root-scope=%s",
+               BT_COMP_LOGE("Root field class is not available: root-scope=%s",
                        ctf_scope_string(field_path->root));
                goto end;
        }
@@ -762,12 +771,13 @@ void get_ctx_stack_field_path(struct resolve_context *ctx,
  * objects having the same root scope.
  */
 int64_t get_field_paths_lca_index(struct ctf_field_path *field_path1,
-               struct ctf_field_path *field_path2)
+               struct ctf_field_path *field_path2,
+               struct resolve_context *ctx)
 {
        int64_t lca_index = 0;
        uint64_t field_path1_len, field_path2_len;
 
-       if (BT_LOG_ON_VERBOSE) {
+       if (BT_LOG_ON_TRACE) {
                GString *field_path1_pretty =
                        ctf_field_path_string(field_path1);
                GString *field_path2_pretty =
@@ -777,7 +787,7 @@ int64_t get_field_paths_lca_index(struct ctf_field_path *field_path1,
                const char *field_path2_pretty_str =
                        field_path2_pretty ? field_path2_pretty->str : NULL;
 
-               BT_LOGD("Finding lowest common ancestor (LCA) between two field paths: "
+               BT_COMP_LOGD("Finding lowest common ancestor (LCA) between two field paths: "
                        "field-path-1=\"%s\", field-path-2=\"%s\"",
                        field_path1_pretty_str, field_path2_pretty_str);
 
@@ -807,7 +817,7 @@ int64_t get_field_paths_lca_index(struct ctf_field_path *field_path1,
                         * This is invalid because the target cannot be
                         * an ancestor of the source.
                         */
-                       BT_LOGE("Source field class is an ancestor of target field class or vice versa: "
+                       BT_COMP_LOGE("Source field class is an ancestor of target field class or vice versa: "
                                "lca-index=%" PRId64 ", "
                                "field-path-1-len=%" PRIu64 ", "
                                "field-path-2-len=%" PRIu64,
@@ -829,7 +839,7 @@ int64_t get_field_paths_lca_index(struct ctf_field_path *field_path1,
                lca_index++;
        }
 
-       BT_LOGD("Found LCA: lca-index=%" PRId64, lca_index);
+       BT_COMP_LOGD("Found LCA: lca-index=%" PRId64, lca_index);
        return lca_index;
 }
 
@@ -854,7 +864,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
         * Make sure the target is not a root.
         */
        if (target_field_path_len == 0) {
-               BT_LOGE_STR("Target field path's length is 0 (targeting the root).");
+               BT_COMP_LOGE_STR("Target field path's length is 0 (targeting the root).");
                ret = -1;
                goto end;
        }
@@ -864,7 +874,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
         * after the context field path's root.
         */
        if (target_field_path->root > ctx_field_path.root) {
-               BT_LOGE("Target field class is located after source field class: "
+               BT_COMP_LOGE("Target field class is located after source field class: "
                        "target-root=%s, source-root=%s",
                        ctf_scope_string(target_field_path->root),
                        ctf_scope_string(ctx_field_path.root));
@@ -880,9 +890,9 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
                 * paths.
                 */
                lca_index = get_field_paths_lca_index(target_field_path,
-                       &ctx_field_path);
+                       &ctx_field_path, ctx);
                if (lca_index < 0) {
-                       BT_LOGE_STR("Cannot get least common ancestor.");
+                       BT_COMP_LOGE_STR("Cannot get least common ancestor.");
                        ret = -1;
                        goto end;
                }
@@ -897,7 +907,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
                        &ctx_field_path, (uint64_t) lca_index);
 
                if (target_index >= ctx_index) {
-                       BT_LOGE("Target field class's index is greater than or equal to source field class's index in LCA: "
+                       BT_COMP_LOGE("Target field class's index is greater than or equal to source field class's index in LCA: "
                                "lca-index=%" PRId64 ", "
                                "target-index=%" PRId64 ", "
                                "source-index=%" PRId64,
@@ -913,7 +923,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
        switch (ctx->cur_fc->type) {
        case CTF_FIELD_CLASS_TYPE_VARIANT:
                if (target_fc->type != CTF_FIELD_CLASS_TYPE_ENUM) {
-                       BT_LOGE("Variant field class's tag field class is not an enumeration field class: "
+                       BT_COMP_LOGE("Variant field class's tag field class is not an enumeration field class: "
                                "tag-fc-addr=%p, tag-fc-id=%d",
                                target_fc, target_fc->type);
                        ret = -1;
@@ -926,7 +936,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
 
                if (target_fc->type != CTF_FIELD_CLASS_TYPE_INT &&
                                target_fc->type != CTF_FIELD_CLASS_TYPE_ENUM) {
-                       BT_LOGE("Sequence field class's length field class is not an unsigned integer field class: "
+                       BT_COMP_LOGE("Sequence field class's length field class is not an unsigned integer field class: "
                                "length-fc-addr=%p, length-fc-id=%d",
                                target_fc, target_fc->type);
                        ret = -1;
@@ -934,7 +944,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path,
                }
 
                if (int_fc->is_signed) {
-                       BT_LOGE("Sequence field class's length field class is not an unsigned integer field class: "
+                       BT_COMP_LOGE("Sequence field class's length field class is not an unsigned integer field class: "
                                "length-fc-addr=%p, length-fc-id=%d",
                                target_fc, target_fc->type);
                        ret = -1;
@@ -986,7 +996,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc,
        }
 
        if (!pathstr) {
-               BT_LOGE_STR("Cannot get path string.");
+               BT_COMP_LOGE_STR("Cannot get path string.");
                ret = -1;
                goto end;
        }
@@ -994,7 +1004,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc,
        /* Get target field path out of path string */
        ret = pathstr_to_field_path(pathstr, &target_field_path, ctx);
        if (ret) {
-               BT_LOGE("Cannot get target field path for path string: "
+               BT_COMP_LOGE("Cannot get target field path for path string: "
                        "path=\"%s\"", pathstr);
                goto end;
        }
@@ -1007,7 +1017,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc,
        /* Get target field class */
        target_fc = field_path_to_field_class(&target_field_path, ctx);
        if (!target_fc) {
-               BT_LOGE("Cannot get target field class for path string: "
+               BT_COMP_LOGE("Cannot get target field class for path string: "
                        "path=\"%s\", target-field-path=\"%s\"",
                        pathstr, target_field_path_pretty_str);
                ret = -1;
@@ -1017,7 +1027,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc,
        ret = validate_target_field_path(&target_field_path,
                target_fc, ctx);
        if (ret) {
-               BT_LOGE("Invalid target field path for path string: "
+               BT_COMP_LOGE("Invalid target field path for path string: "
                        "path=\"%s\", target-field-path=\"%s\"",
                        pathstr, target_field_path_pretty_str);
                goto end;
@@ -1078,7 +1088,7 @@ int resolve_field_class(struct ctf_field_class *fc, struct resolve_context *ctx)
        case CTF_FIELD_CLASS_TYPE_VARIANT:
                ret = resolve_sequence_or_variant_field_class(fc, ctx);
                if (ret) {
-                       BT_LOGE("Cannot resolve sequence field class's length or variant field class's tag: "
+                       BT_COMP_LOGE("Cannot resolve sequence field class's length or variant field class's tag: "
                                "ret=%d, fc-addr=%p", ret, fc);
                        goto end;
                }
@@ -1099,9 +1109,9 @@ int resolve_field_class(struct ctf_field_class *fc, struct resolve_context *ctx)
                uint64_t field_count =
                        ctf_field_class_compound_get_field_class_count(fc);
 
-               ret = field_class_stack_push(ctx->field_class_stack, fc);
+               ret = field_class_stack_push(ctx->field_class_stack, fc, ctx);
                if (ret) {
-                       BT_LOGE("Cannot push field class on context's stack: "
+                       BT_COMP_LOGE("Cannot push field class on context's stack: "
                                "fc-addr=%p", fc);
                        goto end;
                }
@@ -1123,7 +1133,7 @@ int resolve_field_class(struct ctf_field_class *fc, struct resolve_context *ctx)
                                                (int64_t) i;
                        }
 
-                       BT_LOGD("Resolving field class's child field class: "
+                       BT_COMP_LOGD("Resolving field class's child field class: "
                                "parent-fc-addr=%p, child-fc-addr=%p, "
                                "index=%" PRIu64 ", count=%" PRIu64,
                                fc, child_fc, i, field_count);
@@ -1133,7 +1143,7 @@ int resolve_field_class(struct ctf_field_class *fc, struct resolve_context *ctx)
                        }
                }
 
-               field_class_stack_pop(ctx->field_class_stack);
+               field_class_stack_pop(ctx->field_class_stack, ctx);
                break;
        }
        default:
@@ -1176,7 +1186,7 @@ int resolve_event_class_field_classes(struct resolve_context *ctx,
        ctx->scopes.event_spec_context = ec->spec_context_fc;
        ret = resolve_root_class(CTF_SCOPE_EVENT_COMMON_CONTEXT, ctx);
        if (ret) {
-               BT_LOGE("Cannot resolve event specific context field class: "
+               BT_COMP_LOGE("Cannot resolve event specific context field class: "
                        "ret=%d", ret);
                goto end;
        }
@@ -1184,7 +1194,7 @@ int resolve_event_class_field_classes(struct resolve_context *ctx,
        ctx->scopes.event_payload = ec->payload_fc;
        ret = resolve_root_class(CTF_SCOPE_EVENT_PAYLOAD, ctx);
        if (ret) {
-               BT_LOGE("Cannot resolve event payload field class: "
+               BT_COMP_LOGE("Cannot resolve event payload field class: "
                        "ret=%d", ret);
                goto end;
        }
@@ -1212,7 +1222,7 @@ int resolve_stream_class_field_classes(struct resolve_context *ctx,
                ctx->scopes.packet_context = sc->packet_context_fc;
                ret = resolve_root_class(CTF_SCOPE_PACKET_CONTEXT, ctx);
                if (ret) {
-                       BT_LOGE("Cannot resolve packet context field class: "
+                       BT_COMP_LOGE("Cannot resolve packet context field class: "
                                "ret=%d", ret);
                        goto end;
                }
@@ -1220,7 +1230,7 @@ int resolve_stream_class_field_classes(struct resolve_context *ctx,
                ctx->scopes.event_header = sc->event_header_fc;
                ret = resolve_root_class(CTF_SCOPE_EVENT_HEADER, ctx);
                if (ret) {
-                       BT_LOGE("Cannot resolve event header field class: "
+                       BT_COMP_LOGE("Cannot resolve event header field class: "
                                "ret=%d", ret);
                        goto end;
                }
@@ -1228,7 +1238,7 @@ int resolve_stream_class_field_classes(struct resolve_context *ctx,
                ctx->scopes.event_common_context = sc->event_common_context_fc;
                ret = resolve_root_class(CTF_SCOPE_EVENT_SPECIFIC_CONTEXT, ctx);
                if (ret) {
-                       BT_LOGE("Cannot resolve event common context field class: "
+                       BT_COMP_LOGE("Cannot resolve event common context field class: "
                                "ret=%d", ret);
                        goto end;
                }
@@ -1243,7 +1253,7 @@ int resolve_stream_class_field_classes(struct resolve_context *ctx,
 
                ret = resolve_event_class_field_classes(ctx, ec);
                if (ret) {
-                       BT_LOGE("Cannot resolve event class's field classes: "
+                       BT_COMP_LOGE("Cannot resolve event class's field classes: "
                                "ec-id=%" PRIu64 ", ec-name=\"%s\"",
                                ec->id, ec->name->str);
                        goto end;
@@ -1259,11 +1269,14 @@ end:
 }
 
 BT_HIDDEN
-int ctf_trace_class_resolve_field_classes(struct ctf_trace_class *tc)
+int ctf_trace_class_resolve_field_classes(struct ctf_trace_class *tc,
+               struct meta_log_config *log_cfg)
 {
        int ret = 0;
        uint64_t i;
-       struct resolve_context ctx = {
+       struct resolve_context local_ctx = {
+               .log_level = log_cfg->log_level,
+               .self_comp = log_cfg->self_comp,
                .tc = tc,
                .sc = NULL,
                .ec = NULL,
@@ -1278,39 +1291,40 @@ int ctf_trace_class_resolve_field_classes(struct ctf_trace_class *tc)
                .root_scope = CTF_SCOPE_PACKET_HEADER,
                .cur_fc = NULL,
        };
+       struct resolve_context *ctx = &local_ctx;
 
        /* Initialize class stack */
-       ctx.field_class_stack = field_class_stack_create();
-       if (!ctx.field_class_stack) {
-               BT_LOGE_STR("Cannot create field class stack.");
+       ctx->field_class_stack = field_class_stack_create();
+       if (!ctx->field_class_stack) {
+               BT_COMP_LOGE_STR("Cannot create field class stack.");
                ret = -1;
                goto end;
        }
 
        if (!tc->is_translated) {
-               ctx.scopes.packet_header = tc->packet_header_fc;
-               ret = resolve_root_class(CTF_SCOPE_PACKET_HEADER, &ctx);
+               ctx->scopes.packet_header = tc->packet_header_fc;
+               ret = resolve_root_class(CTF_SCOPE_PACKET_HEADER, ctx);
                if (ret) {
-                       BT_LOGE("Cannot resolve packet header field class: "
+                       BT_COMP_LOGE("Cannot resolve packet header field class: "
                                "ret=%d", ret);
                        goto end;
                }
        }
 
-       ctx.scopes.packet_header = tc->packet_header_fc;
+       ctx->scopes.packet_header = tc->packet_header_fc;
 
        for (i = 0; i < tc->stream_classes->len; i++) {
                struct ctf_stream_class *sc = tc->stream_classes->pdata[i];
 
-               ret = resolve_stream_class_field_classes(&ctx, sc);
+               ret = resolve_stream_class_field_classes(ctx, sc);
                if (ret) {
-                       BT_LOGE("Cannot resolve stream class's field classes: "
+                       BT_COMP_LOGE("Cannot resolve stream class's field classes: "
                                "sc-id=%" PRIu64, sc->id);
                        goto end;
                }
        }
 
 end:
-       field_class_stack_destroy(ctx.field_class_stack);
+       field_class_stack_destroy(ctx->field_class_stack);
        return ret;
 }
This page took 0.03503 seconds and 4 git commands to generate.