`ctf` plugin: metadata: use BT_COMP_LOG*() instead of BT_LOG*()

[babeltrace.git] / src / plugins / ctf / common / metadata / ctf-meta-warn-meaningless-header-fields.c

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
index 27c4798322d33365830400d585d58133274569cd..e8a9022028bb1506ecf0bf4b5f681588e25f8040 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
@@ -12,9 +12,10 @@
  * all copies or substantial portions of the Software.
  */
 
-#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
+#define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/WARN-MEANINGLESS-HEADER-FIELDS"
-#include "logging/log.h"
+#include "plugins/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"
@@ -25,18 +26,19 @@
 #include <inttypes.h>
 
 #include "ctf-meta-visitors.h"
+#include "logging.h"
 
 static inline
 void warn_meaningless_field(const char *name, const char *scope_name,
-               bt_logging_level log_level)
+               struct meta_log_config *log_cfg)
 {
-       BT_LOGW("User field found in %s: ignoring: name=\"%s\"",
+       BT_COMP_LOGW("User field found in %s: ignoring: name=\"%s\"",
                scope_name, name);
 }
 
 static inline
 void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
-               const char *scope_name, bt_logging_level log_level)
+               const char *scope_name, struct meta_log_config *log_cfg)
 {
        uint64_t i;
 
@@ -47,7 +49,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
        switch (fc->type) {
        case CTF_FIELD_CLASS_TYPE_FLOAT:
        case CTF_FIELD_CLASS_TYPE_STRING:
-               warn_meaningless_field(name, scope_name, log_level);
+               warn_meaningless_field(name, scope_name, log_cfg);
                break;
        case CTF_FIELD_CLASS_TYPE_INT:
        case CTF_FIELD_CLASS_TYPE_ENUM:
@@ -56,7 +58,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
 
                if (int_fc->meaning == CTF_FIELD_CLASS_MEANING_NONE &&
                                !int_fc->mapped_clock_class) {
-                       warn_meaningless_field(name, scope_name, log_level);
+                       warn_meaningless_field(name, scope_name, log_cfg);
                }
 
                break;
@@ -71,7 +73,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
                                        struct_fc, i);
 
                        warn_meaningless_fields(named_fc->fc,
-                               named_fc->name->str, scope_name, log_level);
+                               named_fc->name->str, scope_name, log_cfg);
                }
 
                break;
@@ -86,7 +88,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
                                        var_fc, i);
 
                        warn_meaningless_fields(named_fc->fc,
-                               named_fc->name->str, scope_name, log_level);
+                               named_fc->name->str, scope_name, log_cfg);
                }
 
                break;
@@ -106,7 +108,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
                struct ctf_field_class_array_base *array_fc = (void *) fc;
 
                warn_meaningless_fields(array_fc->elem_fc, name, scope_name,
-                       log_level);
+                       log_cfg);
                break;
        }
        default:
@@ -120,14 +122,14 @@ end:
 BT_HIDDEN
 void ctf_trace_class_warn_meaningless_header_fields(
                struct ctf_trace_class *ctf_tc,
-               bt_logging_level log_level)
+               struct meta_log_config *log_cfg)
 {
        uint64_t i;
 
        if (!ctf_tc->is_translated) {
                warn_meaningless_fields(
                        ctf_tc->packet_header_fc, NULL, "packet header",
-                       log_level);
+                       log_cfg);
        }
 
        for (i = 0; i < ctf_tc->stream_classes->len; i++) {
@@ -135,7 +137,7 @@ void ctf_trace_class_warn_meaningless_header_fields(
 
                if (!sc->is_translated) {
                        warn_meaningless_fields(sc->event_header_fc, NULL,
-                               "event header", log_level);
+                               "event header", log_cfg);
                }
        }
 }