X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta-warn-meaningless-header-fields.c;h=27c4798322d33365830400d585d58133274569cd;hb=0746848ce8b40484254eeace3962a7654d01c7bc;hp=c43648ac46079052dd55a07c76bfe21a7782edaf;hpb=ea14c7dd641ec094a4c63e2f6de59aab8cbb8603;p=babeltrace.git

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 c43648ac..27c47983 100644
--- 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,8 +12,9 @@
  * all copies or substantial portions of the Software.
  */
 
+#define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/CTF/META/WARN-MEANINGLESS-HEADER-FIELDS"
-#include "logging.h"
+#include "logging/log.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"
@@ -26,7 +27,8 @@
 #include "ctf-meta-visitors.h"
 
 static inline
-void warn_meaningless_field(const char *name, const char *scope_name)
+void warn_meaningless_field(const char *name, const char *scope_name,
+		bt_logging_level log_level)
 {
 	BT_LOGW("User field found in %s: ignoring: name=\"%s\"",
 		scope_name, name);
@@ -34,7 +36,7 @@ void warn_meaningless_field(const char *name, const char *scope_name)
 
 static inline
 void warn_meaningless_fields(struct ctf_field_class *fc, const char *name,
-		const char *scope_name)
+		const char *scope_name, bt_logging_level log_level)
 {
 	uint64_t i;
 
@@ -45,7 +47,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);
+		warn_meaningless_field(name, scope_name, log_level);
 		break;
 	case CTF_FIELD_CLASS_TYPE_INT:
 	case CTF_FIELD_CLASS_TYPE_ENUM:
@@ -54,7 +56,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);
+			warn_meaningless_field(name, scope_name, log_level);
 		}
 
 		break;
@@ -69,7 +71,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);
+				named_fc->name->str, scope_name, log_level);
 		}
 
 		break;
@@ -84,7 +86,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);
+				named_fc->name->str, scope_name, log_level);
 		}
 
 		break;
@@ -103,7 +105,8 @@ 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);
+		warn_meaningless_fields(array_fc->elem_fc, name, scope_name,
+			log_level);
 		break;
 	}
 	default:
@@ -116,13 +119,15 @@ end:
 
 BT_HIDDEN
 void ctf_trace_class_warn_meaningless_header_fields(
-		struct ctf_trace_class *ctf_tc)
+		struct ctf_trace_class *ctf_tc,
+		bt_logging_level log_level)
 {
 	uint64_t i;
 
 	if (!ctf_tc->is_translated) {
 		warn_meaningless_fields(
-			ctf_tc->packet_header_fc, NULL, "packet header");
+			ctf_tc->packet_header_fc, NULL, "packet header",
+			log_level);
 	}
 
 	for (i = 0; i < ctf_tc->stream_classes->len; i++) {
@@ -130,7 +135,7 @@ void ctf_trace_class_warn_meaningless_header_fields(
 
 		if (!sc->is_translated) {
 			warn_meaningless_fields(sc->event_header_fc, NULL,
-				"event header");
+				"event header", log_level);
 		}
 	}
 }