src.ctf.fs: remove ctf_fs_component_create

Remove this function, as it's now a simple wrapper around constructing a
ctf_fs_component.

Change-Id: Ifc6c751ff66f43c81c1a0abd6d7b27393b96f4ad
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8307
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12334
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 113bf8d30c75a414f4421a14d82ec898ea33c426..8f6e2c8a128d9dba9ee25c8df893485ed1dfdf48 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -257,11 +257,6 @@ end:
     }
 }
 
-ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger)
-{
-    return bt2s::make_unique<ctf_fs_component>(parentLogger);
-}
-
 void ctf_fs_finalize(bt_self_component_source *component)
 {
     ctf_fs_component::UP {static_cast<ctf_fs_component *>(
@@ -1775,11 +1770,8 @@ static ctf_fs_component::UP ctf_fs_create(const bt_value *params,
     const bt_value *trace_name_value;
     bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
 
-    ctf_fs_component::UP ctf_fs = ctf_fs_component_create(
+    ctf_fs_component::UP ctf_fs = bt2s::make_unique<ctf_fs_component>(
         bt2c::Logger {bt2::SelfSourceComponent {self_comp_src}, "PLUGIN/SRC.CTF.FS/COMP"});
-    if (!ctf_fs) {
-        return nullptr;
-    }
 
     if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value, ctf_fs.get())) {
         return nullptr;

diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index 5d43b38f5bcaf4a9c3ac346e70a07201da471ce1..6acbfc5173201a957928c81da485a3e7c6d7c12a 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -145,10 +145,6 @@ ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const
 bt_message_iterator_class_seek_beginning_method_status
 ctf_fs_iterator_seek_beginning(bt_self_message_iterator *message_iterator);
 
-/* Create and initialize a new, empty ctf_fs_component. */
-
-ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger);
-
 /*
  * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing
  * the same UUID.

diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp
index bb31b17d38c4b498894760fdc94805104d4e1b3b..b4b639080a48f99f8ee9815306914f0026603276 100644 (file)
--- a/src/plugins/ctf/fs-src/query.cpp
+++ b/src/plugins/ctf/fs-src/query.cpp
@@ -168,27 +168,21 @@ static void populate_trace_info(const struct ctf_fs_trace *trace, const bt2::Map
 
 bt2::Value::Shared trace_infos_query(const bt2::ConstMapValue params, const bt2c::Logger& logger)
 {
-    ctf_fs_component::UP ctf_fs = ctf_fs_component_create(logger);
-    if (!ctf_fs) {
-        BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2::Error,
-                                               "Cannot create ctf_fs_component");
-    }
-
+    ctf_fs_component ctf_fs {logger};
     const bt_value *inputs_value = NULL;
     const bt_value *trace_name_value;
 
-    if (!read_src_fs_parameters(params.libObjPtr(), &inputs_value, &trace_name_value,
-                                ctf_fs.get())) {
+    if (!read_src_fs_parameters(params.libObjPtr(), &inputs_value, &trace_name_value, &ctf_fs)) {
         BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2::Error, "Failed to read parameters");
     }
 
-    if (ctf_fs_component_create_ctf_fs_trace(ctf_fs.get(), inputs_value, trace_name_value, NULL)) {
+    if (ctf_fs_component_create_ctf_fs_trace(&ctf_fs, inputs_value, trace_name_value, NULL)) {
         BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(logger, bt2::Error, "Failed to create trace");
     }
 
     const auto result = bt2::ArrayValue::create();
     const auto traceInfo = result->appendEmptyMap();
-    populate_trace_info(ctf_fs->trace.get(), traceInfo, logger);
+    populate_trace_info(ctf_fs.trace.get(), traceInfo, logger);
 
     return result;
 }