src.ctf.lttng-live: make lttng_live_stream_iterator::msg_iter a ctf_msg_iter_up

[babeltrace.git] / src / plugins / ctf / lttng-live / lttng-live.hpp

diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp
index 87c80e533d999b2fd60c0a0c3a8a48f676ddf374..8fa926b70d974e4601a5c3a0fe65fdcdf267f58c 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -74,8 +74,7 @@ struct lttng_live_stream_iterator
 
     bt2c::Logger logger;
 
-    /* Owned by this. */
-    bt_stream *stream = nullptr;
+    bt2::Stream::Shared stream;
 
     /* Weak reference. */
     struct lttng_live_trace *trace = nullptr;
@@ -84,7 +83,7 @@ struct lttng_live_stream_iterator
      * Since only a single iterator per viewer connection, we have
      * only a single message iterator per stream.
      */
-    struct ctf_msg_iter *msg_iter = nullptr;
+    ctf_msg_iter_up msg_iter;
 
     uint64_t viewer_stream_id = 0;
 
@@ -140,6 +139,8 @@ struct lttng_live_stream_iterator
 
 struct lttng_live_metadata
 {
+    using UP = std::unique_ptr<lttng_live_metadata>;
+
     explicit lttng_live_metadata(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/METADATA"}
     {
@@ -190,13 +191,11 @@ struct lttng_live_trace
     /* ctf trace ID within the session. */
     uint64_t id = 0;
 
-    /* Owned by this. */
-    bt_trace *trace = nullptr;
+    bt2::Trace::Shared trace;
 
-    /* Weak reference. */
-    bt_trace_class *trace_class = nullptr;
+    bt2::TraceClass::Shared trace_class;
 
-    struct lttng_live_metadata *metadata = nullptr;
+    lttng_live_metadata::UP metadata;
 
     const bt_clock_class *clock_class = nullptr;
 
@@ -251,6 +250,8 @@ enum session_not_found_action
  */
 struct lttng_live_component
 {
+    using UP = std::unique_ptr<lttng_live_component>;
+
     explicit lttng_live_component(bt2c::Logger loggerParam) noexcept :
         logger {std::move(loggerParam)}
     {
@@ -263,7 +264,7 @@ struct lttng_live_component
 
     struct
     {
-        GString *url = nullptr;
+        std::string url;
         enum session_not_found_action sess_not_found_act = SESSION_NOT_FOUND_ACTION_CONTINUE;
     } params;