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

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

diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp
index f0e7edda461798a6352f4752721be9738a59d5ec..ecf450f40a9f258376ae79da0cb92992bc2f388b 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -12,6 +12,8 @@
 
 #include <babeltrace2/babeltrace.h>
 
+#include "cpp-common/bt2c/logging.hpp"
+
 #include "../common/src/msg-iter/msg-iter.hpp"
 
 struct ctf_fs_ds_file_info
@@ -25,10 +27,12 @@ struct ctf_fs_ds_file_info
 
 struct ctf_fs_ds_file
 {
-    bt_logging_level log_level = (bt_logging_level) 0;
+    explicit ctf_fs_ds_file(const bt2c::Logger& parentLogger) :
+        logger {parentLogger, "PLUGIN/SRC.CTF.FS/DS"}
+    {
+    }
 
-    /* Weak */
-    bt_self_component *self_comp = nullptr;
+    bt2c::Logger logger;
 
     /* Weak */
     struct ctf_fs_metadata *metadata = nullptr;
@@ -61,7 +65,7 @@ struct ctf_fs_ds_file
 };
 
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(struct ctf_fs_trace *ctf_fs_trace, bt_stream *stream,
-                                             const char *path, bt_logging_level log_level);
+                                             const char *path, const bt2c::Logger& logger);
 
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
@@ -69,8 +73,7 @@ struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_fil
                                                    struct ctf_fs_ds_file_info *ds_file_info,
                                                    struct ctf_msg_iter *msg_iter);
 
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level,
-                                               bt_self_component *self_comp);
+struct ctf_fs_ds_index *ctf_fs_ds_index_create(const bt2c::Logger& logger);
 
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
@@ -93,7 +96,7 @@ extern struct ctf_msg_iter_medium_ops ctf_fs_ds_group_medops;
 
 enum ctf_msg_iter_medium_status ctf_fs_ds_group_medops_data_create(
     struct ctf_fs_ds_file_group *ds_file_group, bt_self_message_iterator *self_msg_iter,
-    bt_logging_level log_level, struct ctf_fs_ds_group_medops_data **out);
+    const bt2c::Logger& logger, struct ctf_fs_ds_group_medops_data **out);
 
 void ctf_fs_ds_group_medops_data_reset(struct ctf_fs_ds_group_medops_data *data);