Make API CTF-agnostic

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

diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index 6ae43df90212d7773d3bf26d0902ff92a62bfe2b..e949374d6320dbfa2005961ae111eaa32df05c2f 100644 (file)
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -27,10 +27,11 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
+#include <babeltrace/babeltrace.h>
 
 #include "fs.h"
 #include "file.h"
@@ -51,7 +52,7 @@ FILE *ctf_fs_metadata_open_file(const char *trace_path)
                goto end;
        }
 
-       g_string_append(metadata_path, "/" CTF_FS_METADATA_FILENAME);
+       g_string_append(metadata_path, G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME);
        fp = fopen(metadata_path->str, "rb");
        g_string_free(metadata_path, TRUE);
 end:
@@ -67,7 +68,7 @@ static struct ctf_fs_file *get_file(const char *trace_path)
        }
 
        g_string_append(file->path, trace_path);
-       g_string_append(file->path, "/" CTF_FS_METADATA_FILENAME);
+       g_string_append(file->path, G_DIR_SEPARATOR_S CTF_FS_METADATA_FILENAME);
 
        if (ctf_fs_file_open(file, "rb")) {
                goto error;
@@ -90,7 +91,6 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace,
 {
        int ret = 0;
        struct ctf_fs_file *file = NULL;
-       struct ctf_metadata_decoder *metadata_decoder = NULL;
        struct ctf_metadata_decoder_config decoder_config = {
                .clock_class_offset_s = config ? config->clock_class_offset_s : 0,
                .clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
@@ -103,28 +103,32 @@ int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace,
                goto end;
        }
 
-       metadata_decoder = ctf_metadata_decoder_create(
+       ctf_fs_trace->metadata->decoder = ctf_metadata_decoder_create(
                config ? &decoder_config : NULL,
                ctf_fs_trace->name->str);
-       if (!metadata_decoder) {
+       if (!ctf_fs_trace->metadata->decoder) {
                BT_LOGE("Cannot create metadata decoder object");
                ret = -1;
                goto end;
        }
 
-       ret = ctf_metadata_decoder_decode(metadata_decoder, file->fp);
+       ret = ctf_metadata_decoder_decode(ctf_fs_trace->metadata->decoder,
+               file->fp);
        if (ret) {
                BT_LOGE("Cannot decode metadata file");
                goto end;
        }
 
-       ctf_fs_trace->metadata->trace = ctf_metadata_decoder_get_trace(
-               metadata_decoder);
-       assert(ctf_fs_trace->metadata->trace);
+       ctf_fs_trace->metadata->trace = ctf_metadata_decoder_get_ir_trace(
+               ctf_fs_trace->metadata->decoder);
+       BT_ASSERT(ctf_fs_trace->metadata->trace);
+       ctf_fs_trace->metadata->tc =
+               ctf_metadata_decoder_borrow_ctf_trace_class(
+                       ctf_fs_trace->metadata->decoder);
+       BT_ASSERT(ctf_fs_trace->metadata->tc);
 
 end:
        ctf_fs_file_destroy(file);
-       ctf_metadata_decoder_destroy(metadata_decoder);
        return ret;
 }
 
@@ -143,4 +147,8 @@ void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata)
        if (metadata->trace) {
                BT_PUT(metadata->trace);
        }
+
+       if (metadata->decoder) {
+               ctf_metadata_decoder_destroy(metadata->decoder);
+       }
 }