src.ctf.lttng-live: make lttng_live_msg_iter::sessions an std::vector

[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 56c86d39a679cadbe995e585800588c5ea1efa0e..630110023eb4f6a909e156b746bbca178679c188 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -68,11 +68,15 @@ inline const char *format_as(const lttng_live_stream_state state) noexcept
 /* Iterator over a live stream. */
 struct lttng_live_stream_iterator
 {
+    using UP = std::unique_ptr<lttng_live_stream_iterator>;
+
     explicit lttng_live_stream_iterator(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/STREAM-ITER"}
     {
     }
 
+    ~lttng_live_stream_iterator();
+
     bt2c::Logger logger;
 
     bt2::Stream::Shared stream;
@@ -173,6 +177,8 @@ enum lttng_live_metadata_stream_state
 
 struct lttng_live_trace
 {
+    using UP = std::unique_ptr<lttng_live_trace>;
+
     explicit lttng_live_trace(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/TRACE"}
     {
@@ -194,9 +200,7 @@ struct lttng_live_trace
 
     const bt_clock_class *clock_class = nullptr;
 
-    /* Array of pointers to struct lttng_live_stream_iterator. */
-    /* Owned by this. */
-    GPtrArray *stream_iterators = nullptr;
+    std::vector<lttng_live_stream_iterator::UP> stream_iterators;
 
     enum lttng_live_metadata_stream_state metadata_stream_state =
         LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED;
@@ -204,11 +208,15 @@ struct lttng_live_trace
 
 struct lttng_live_session
 {
+    using UP = std::unique_ptr<lttng_live_session>;
+
     explicit lttng_live_session(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/SESSION"}
     {
     }
 
+    ~lttng_live_session();
+
     bt2c::Logger logger;
 
     bt_self_component *self_comp = nullptr;
@@ -216,16 +224,13 @@ struct lttng_live_session
     /* Weak reference. */
     struct lttng_live_msg_iter *lttng_live_msg_iter = nullptr;
 
-    /* Owned by this. */
-    GString *hostname = nullptr;
+    std::string hostname;
 
-    /* Owned by this. */
-    GString *session_name = nullptr;
+    std::string session_name;
 
     uint64_t id = 0;
 
-    /* Array of pointers to struct lttng_live_trace. */
-    GPtrArray *traces = nullptr;
+    std::vector<lttng_live_trace::UP> traces;
 
     bool attached = false;
     bool new_streams_needed = false;
@@ -292,8 +297,7 @@ struct lttng_live_msg_iter
     /* Owned by this. */
     struct live_viewer_connection *viewer_connection = nullptr;
 
-    /* Array of pointers to struct lttng_live_session. */
-    GPtrArray *sessions = nullptr;
+    std::vector<lttng_live_session::UP> sessions;
 
     /* Number of live stream iterator this message iterator has.*/
     uint64_t active_stream_iter = 0;