X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fmetadata.c;h=403ed03da0dd5ea618736b4c12bb3b97cc008021;hb=98903a3ed6827edb1228cf8f9f30a6eb1b81bb49;hp=16463292bb9a350b630794536a3e5f1a1da0905a;hpb=2ece7dd044d2f520c313eb967523843de5023e9e;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c
index 16463292..403ed03d 100644
--- a/src/plugins/ctf/fs-src/metadata.c
+++ b/src/plugins/ctf/fs-src/metadata.c
@@ -23,6 +23,10 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
+#include "logging/log.h"
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -38,9 +42,6 @@
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 
-#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
-#include "logging.h"
-
 BT_HIDDEN
 FILE *ctf_fs_metadata_open_file(const char *trace_path)
 {
@@ -59,9 +60,10 @@ end:
 	return fp;
 }
 
-static struct ctf_fs_file *get_file(const char *trace_path)
+static struct ctf_fs_file *get_file(const char *trace_path,
+		bt_logging_level log_level)
 {
-	struct ctf_fs_file *file = ctf_fs_file_create();
+	struct ctf_fs_file *file = ctf_fs_file_create(log_level);
 
 	if (!file) {
 		goto error;
@@ -95,13 +97,14 @@ int ctf_fs_metadata_set_trace_class(
 	int ret = 0;
 	struct ctf_fs_file *file = NULL;
 	struct ctf_metadata_decoder_config decoder_config = {
-		.log_level = BT_LOG_OUTPUT_LEVEL,
+		.log_level = ctf_fs_trace->log_level,
 		.self_comp = bt_self_component_source_as_self_component(self_comp),
 		.clock_class_offset_s = config ? config->clock_class_offset_s : 0,
 		.clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
 	};
+	bt_logging_level log_level = ctf_fs_trace->log_level;
 
-	file = get_file(ctf_fs_trace->path->str);
+	file = get_file(ctf_fs_trace->path->str, log_level);
 	if (!file) {
 		BT_LOGE("Cannot create metadata file object");
 		ret = -1;