ctf: use `bt2c::Logger` throughout `src.ctf.fs`, `src.ctf.lttng-live`

[babeltrace.git] / src / plugins / ctf / fs-src / fs.hpp

diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index 320b755a27cee2a0a5d1fda03ad7eaea1d7f67ca..f80368addc8d09f2c87aed35511a9f9eefff16c7 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -14,16 +14,20 @@
 
 #include <babeltrace2/babeltrace.h>
 
+#include "cpp-common/bt2c/logging.hpp"
+
 #include "metadata.hpp"
 
 extern bool ctf_fs_debug;
 
 struct ctf_fs_file
 {
-    bt_logging_level log_level = (bt_logging_level) 0;
+    explicit ctf_fs_file(const bt2c::Logger& parentLogger) :
+        logger {parentLogger, "PLUGIN/SRC.CTF.FS/FILE"}
+    {
+    }
 
-    /* Weak */
-    bt_self_component *self_comp = nullptr;
+    bt2c::Logger logger;
 
     /* Owned by this */
     GString *path = nullptr;
@@ -53,7 +57,12 @@ struct ctf_fs_metadata
 
 struct ctf_fs_component
 {
-    bt_logging_level log_level = (bt_logging_level) 0;
+    explicit ctf_fs_component(const bt2c::Logger& parentLogger) :
+        logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}
+    {
+    }
+
+    bt2c::Logger logger;
 
     /* Array of struct ctf_fs_port_data *, owned by this */
     GPtrArray *port_data = nullptr;
@@ -66,15 +75,12 @@ struct ctf_fs_component
 
 struct ctf_fs_trace
 {
-    bt_logging_level log_level = (bt_logging_level) 0;
+    explicit ctf_fs_trace(const bt2c::Logger& parentLogger) :
+        logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"}
+    {
+    }
 
-    /*
-     * Weak. These are mostly used to generate log messages or to append
-     * error causes. They are mutually exclusive, only one of them must be
-     * set.
-     */
-    bt_self_component *self_comp = nullptr;
-    bt_self_component_class *self_comp_class = nullptr;
+    bt2c::Logger logger;
 
     /* Owned by this */
     struct ctf_fs_metadata *metadata = nullptr;
@@ -169,14 +175,17 @@ struct ctf_fs_port_data
 
 struct ctf_fs_msg_iter_data
 {
-    bt_logging_level log_level = (bt_logging_level) 0;
-
-    /* Weak */
-    bt_self_component *self_comp = nullptr;
+    explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
+        self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
+                                             "PLUGIN/SRC.CTF.FS/MSG-ITER"}
+    {
+    }
 
     /* Weak */
     bt_self_message_iterator *self_msg_iter = nullptr;
 
+    bt2c::Logger logger;
+
     /* Weak, belongs to ctf_fs_trace */
     struct ctf_fs_ds_file_group *ds_file_group = nullptr;
 
@@ -222,7 +231,7 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *message_iterator);
 
 /* Create and initialize a new, empty ctf_fs_component. */
 
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level);
+ctf_fs_component *ctf_fs_component_create(const bt2c::Logger& parentLogger);
 
 /*
  * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing
@@ -239,8 +248,7 @@ struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level);
 int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs,
                                          const bt_value *paths_value,
                                          const bt_value *trace_name_value,
-                                         bt_self_component *self_comp,
-                                         bt_self_component_class *self_comp_class);
+                                         bt_self_component *selfComp);
 
 /* Free `ctf_fs` and everything it owns. */
 
@@ -262,8 +270,7 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs);
  */
 
 bool read_src_fs_parameters(const bt_value *params, const bt_value **paths,
-                            const bt_value **trace_name, struct ctf_fs_component *ctf_fs,
-                            bt_self_component *self_comp, bt_self_component_class *self_comp_class);
+                            const bt_value **trace_name, struct ctf_fs_component *ctf_fs);
 
 /*
  * Generate the port name to be used for a given data stream file group.