src.ctf.lttng-live: add live_viewer_connection destructor

Convert live_viewer_connection_destroy into a destructor.

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I84651d6a2184c75b61667ebf23c28737e5a227c5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8471
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 e5bf148b1486e7a02f13e5020a1df3342d0faf0d..3ddc97502d4801841eb4b608212d99d8bff5f034 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -223,7 +223,7 @@ static void lttng_live_msg_iter_destroy(struct lttng_live_msg_iter *lttng_live_m
     }
 
     if (lttng_live_msg_iter->viewer_connection) {
-        live_viewer_connection_destroy(lttng_live_msg_iter->viewer_connection);
+        delete lttng_live_msg_iter->viewer_connection;
     }
     BT_ASSERT(lttng_live_msg_iter->lttng_live_comp);
     BT_ASSERT(lttng_live_msg_iter->lttng_live_comp->has_msg_iter);
@@ -1823,9 +1823,7 @@ error:
     }
 
 end:
-    if (viewer_connection) {
-        live_viewer_connection_destroy(viewer_connection);
-    }
+    delete viewer_connection;
 
     g_free(validate_error);
 

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp
index f1d0e2f5e2e38f4978a1349c015c7f4964b3f216..d35f09e1c95b271e12eac908d487c2cea4bb08e6 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.cpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp
@@ -1705,32 +1705,19 @@ enum lttng_live_viewer_status live_viewer_connection_create(
     goto end;
 
 error:
-    if (viewer_connection) {
-        live_viewer_connection_destroy(viewer_connection);
-    }
+    delete viewer_connection;
+
 end:
     return status;
 }
 
-BT_HIDDEN
-void live_viewer_connection_destroy(struct live_viewer_connection *viewer_connection)
+live_viewer_connection::~live_viewer_connection()
 {
-    const bt2_common::LogCfg& logCfg = viewer_connection->logCfg;
-
-    if (!viewer_connection) {
-        goto end;
-    }
-
     BT_CLOGD("Closing connection to relay:"
              "relay-url=\"%s\"",
-             viewer_connection->url.c_str());
-
-    lttng_live_disconnect_viewer(viewer_connection);
+             this->url.c_str());
 
-    delete viewer_connection;
+    lttng_live_disconnect_viewer(this);
 
     bt_socket_fini();
-
-end:
-    return;
 }

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.hpp b/src/plugins/ctf/lttng-live/viewer-connection.hpp
index 1b108deaf1574c0c6d71e3616d270fb3453e7a1a..87c1ab1cdcfac218893b841244b3666a463cf7d0 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.hpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.hpp
@@ -60,6 +60,8 @@ struct live_viewer_connection
     {
     }
 
+    ~live_viewer_connection();
+
     const bt2_common::LogCfg logCfg;
 
     std::string url;
@@ -104,8 +106,6 @@ enum lttng_live_viewer_status live_viewer_connection_create(
     const char *url, bool in_query, struct lttng_live_msg_iter *lttng_live_msg_iter,
     const bt2_common::LogCfg& logCfg, struct live_viewer_connection **viewer);
 
-void live_viewer_connection_destroy(struct live_viewer_connection *conn);
-
 enum lttng_live_viewer_status
 lttng_live_create_viewer_session(struct lttng_live_msg_iter *lttng_live_msg_iter);