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>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12380
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 4ecb736c8c8874dc4d16a9d27fc645f1daab6848..41aea66a670ec53d460f96e4ba7c7ef7f290b91b 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -130,11 +130,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);
 
@@ -147,10 +144,8 @@ static void lttng_live_destroy_session(struct lttng_live_session *session)
         goto end;
     }
 
-    BT_CPPLOGD_SPEC(session->logger,
-                    "Destroying live session: "
-                    "session-id={}, session-name=\"{}\"",
-                    session->id, session->session_name->str);
+    BT_CPPLOGD_SPEC(session->logger, "Destroying live session: session-id={}, session-name=\"{}\"",
+                    session->id, session->session_name);
     if (session->id != -1ULL) {
         if (lttng_live_session_detach(session)) {
             if (!lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
@@ -162,14 +157,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:
@@ -357,9 +344,8 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
     }
 
     BT_CPPLOGD_SPEC(lttng_live_msg_iter->logger,
-                    "Updating all data streams: "
-                    "session-id={}, session-name=\"{}\"",
-                    session->id, session->session_name->str);
+                    "Updating all data streams: session-id={}, session-name=\"{}\"", session->id,
+                    session->session_name);
 
     status = lttng_live_session_get_new_streams(session, lttng_live_msg_iter->self_msg_iter);
     switch (status) {
@@ -383,7 +369,7 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
             lttng_live_msg_iter->logger,
             "Updating streams returned _END status. Override status to _OK in order fetch any remaining metadata:"
             "session-id={}, session-name=\"{}\"",
-            session->id, session->session_name->str);
+            session->id, session->session_name);
         status = LTTNG_LIVE_ITERATOR_STATUS_OK;
         break;
     default:
@@ -391,9 +377,8 @@ lttng_live_get_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
     }
 
     BT_CPPLOGD_SPEC(lttng_live_msg_iter->logger,
-                    "Updating metadata stream for session: "
-                    "session-id={}, session-name=\"{}\"",
-                    session->id, session->session_name->str);
+                    "Updating metadata stream for session: session-id={}, session-name=\"{}\"",
+                    session->id, session->session_name);
 
     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 e2b037cb1d4da9259703264b8d4dd8e42da97533..8e1312b5fed4dc937872e5b60c62251d7436bc21 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -220,11 +220,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;