Replace libuuid with internal implementation

[babeltrace.git] / src / plugins / ctf / fs-src / metadata.c

diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c
index 16463292bb9a350b630794536a3e5f1a1da0905a..63b7f0ed417564b267e724001386b63e10cfd0d0 100644 (file)
--- a/src/plugins/ctf/fs-src/metadata.c
+++ b/src/plugins/ctf/fs-src/metadata.c
@@ -23,13 +23,18 @@
  * SOFTWARE.
  */
 
+#define BT_COMP_LOG_SELF_COMP self_comp
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
+#include "plugins/comp-logging.h"
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include "common/assert.h"
 #include <glib.h>
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include "compat/memstream.h"
 #include <babeltrace2/babeltrace.h>
 
@@ -38,9 +43,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 +61,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, bt_self_component *self_comp)
 {
-       struct ctf_fs_file *file = ctf_fs_file_create();
+       struct ctf_fs_file *file = ctf_fs_file_create(log_level, self_comp);
 
        if (!file) {
                goto error;
@@ -88,22 +91,23 @@ end:
 
 BT_HIDDEN
 int ctf_fs_metadata_set_trace_class(
-               bt_self_component_source *self_comp,
+               bt_self_component *self_comp,
                struct ctf_fs_trace *ctf_fs_trace,
                struct ctf_fs_metadata_config *config)
 {
        int ret = 0;
        struct ctf_fs_file *file = NULL;
        struct ctf_metadata_decoder_config decoder_config = {
-               .log_level = BT_LOG_OUTPUT_LEVEL,
-               .self_comp = bt_self_component_source_as_self_component(self_comp),
+               .log_level = ctf_fs_trace->log_level,
+               .self_comp = 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, self_comp);
        if (!file) {
-               BT_LOGE("Cannot create metadata file object");
+               BT_COMP_LOGE("Cannot create metadata file object");
                ret = -1;
                goto end;
        }
@@ -111,7 +115,7 @@ int ctf_fs_metadata_set_trace_class(
        ctf_fs_trace->metadata->decoder = ctf_metadata_decoder_create(
                &decoder_config);
        if (!ctf_fs_trace->metadata->decoder) {
-               BT_LOGE("Cannot create metadata decoder object");
+               BT_COMP_LOGE("Cannot create metadata decoder object");
                ret = -1;
                goto end;
        }
@@ -119,7 +123,7 @@ int ctf_fs_metadata_set_trace_class(
        ret = ctf_metadata_decoder_decode(ctf_fs_trace->metadata->decoder,
                file->fp);
        if (ret) {
-               BT_LOGE("Cannot decode metadata file");
+               BT_COMP_LOGE("Cannot decode metadata file");
                goto end;
        }