src.ctf.lttng-live: make lttng_live_session::{hostname,session_name} std::strings

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I5b0dd1b99d741042b0b2b37a48251ea96d4b3d4f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8464
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index ce99ad4352484a51e23f99a91d32b8b9083ae7b8..7ea23e6d0dd5c483088026fc261c6a04fcf8e3ba 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -192,11 +192,8 @@ int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter, uint
     session->id = session_id;
     session->lttng_live_msg_iter = lttng_live_msg_iter;
     session->new_streams_needed = true;
-    session->hostname = g_string_new(hostname);
-    BT_ASSERT(session->hostname);
-
-    session->session_name = g_string_new(session_name);
-    BT_ASSERT(session->session_name);
+    session->hostname = hostname;
+    session->session_name = session_name;
 
     g_ptr_array_add(lttng_live_msg_iter->sessions, session);
 
@@ -213,7 +210,7 @@ static void lttng_live_destroy_session(struct lttng_live_session *session)
 
     BT_CLOGD("Destroying live session: "
              "session-id=%" PRIu64 ", session-name=\"%s\"",
-             session->id, session->session_name->str);
+             session->id, session->session_name.c_str());
     if (session->id != -1ULL) {
         if (lttng_live_session_detach(session)) {
             if (!lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
@@ -224,14 +221,6 @@ static void lttng_live_destroy_session(struct lttng_live_session *session)
         session->id = -1ULL;
     }
 
-    if (session->hostname) {
-        g_string_free(session->hostname, TRUE);
-    }
-
-    if (session->session_name) {
-        g_string_free(session->session_name, TRUE);
-    }
-
     delete session;
 
 end:
@@ -421,7 +410,7 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
 
     BT_CLOGD("Updating all data streams: "
              "session-id=%" PRIu64 ", session-name=\"%s\"",
-             session->id, session->session_name->str);
+             session->id, session->session_name.c_str());
 
     status = lttng_live_session_get_new_streams(session, lttng_live_msg_iter->self_msg_iter);
     switch (status) {
@@ -444,7 +433,7 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
         BT_CLOGD(
             "Updating streams returned _END status. Override status to _OK in order fetch any remaining metadata:"
             "session-id=%" PRIu64 ", session-name=\"%s\"",
-            session->id, session->session_name->str);
+            session->id, session->session_name.c_str());
         status = LTTNG_LIVE_ITERATOR_STATUS_OK;
         break;
     default:
@@ -453,7 +442,7 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
 
     BT_CLOGD("Updating metadata stream for session: "
              "session-id=%" PRIu64 ", session-name=\"%s\"",
-             session->id, session->session_name->str);
+             session->id, session->session_name.c_str());
 
     for (lttng_live_trace::UP& trace : session->traces) {
         status = lttng_live_metadata_update(trace.get());

diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp
index 41cd5c15a2c87b3b70c9bd5815bc8c734bb47a14..e4d2c48d0a285ffbd5d5098d8a398c9e32cecb7d 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -207,11 +207,9 @@ 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;