src.ctf.fs: remove ctf_fs_metadata_init and ctf_fs_metadata_fini

Change-Id: Ie34c0a5c5aea60aa2fc771d35a39b61ec0eca336
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8285
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12323
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 41b311c1833b1a3506049f6c4ecbdaaedf863ca3..2b2f5bc4b6f29acf53a67ae6a550ac9531510a31 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -262,7 +262,6 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
     }
 
     if (ctf_fs_trace->metadata) {
-        ctf_fs_metadata_fini(ctf_fs_trace->metadata);
         delete ctf_fs_trace->metadata;
     }
 
@@ -747,7 +746,6 @@ static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name,
 
     ctf_fs_trace->path = path;
     ctf_fs_trace->metadata = new ctf_fs_metadata;
-    ctf_fs_metadata_init(ctf_fs_trace->metadata);
 
     ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
     if (ret) {

diff --git a/src/plugins/ctf/fs-src/metadata.cpp b/src/plugins/ctf/fs-src/metadata.cpp
index 4a99ca7eea4faee5bf52d03d678ec7dcf6548fc4..f19a1f47da7e3fe43b76e2aa735de650e61e41c8 100644 (file)
--- a/src/plugins/ctf/fs-src/metadata.cpp
+++ b/src/plugins/ctf/fs-src/metadata.cpp
@@ -100,14 +100,3 @@ int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_
 end:
     return ret;
 }
-
-int ctf_fs_metadata_init(struct ctf_fs_metadata *)
-{
-    /* Nothing to initialize for the moment. */
-    return 0;
-}
-
-void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata)
-{
-    metadata->decoder.reset();
-}

diff --git a/src/plugins/ctf/fs-src/metadata.hpp b/src/plugins/ctf/fs-src/metadata.hpp
index 202980bd09af6931180525cff458503063ff3c07..14d7cc191f19f152df8f0e25921cbb786612957f 100644 (file)
--- a/src/plugins/ctf/fs-src/metadata.hpp
+++ b/src/plugins/ctf/fs-src/metadata.hpp
@@ -21,10 +21,6 @@ class Logger;
 
 #define CTF_FS_METADATA_FILENAME "metadata"
 
-int ctf_fs_metadata_init(struct ctf_fs_metadata *metadata);
-
-void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata);
-
 int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_trace *ctf_fs_trace,
                                     const ctf::src::ClkClsCfg& clkClsCfg);