src.ctf.lttng-live: use viewer_connection_close_socket more

Use viewer_connection_close_socket at all spots we close the control
socket, to de-duplicate code a little bit.

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

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp
index 0cc40b618e4996a33472cb58ff392db193c42c1a..f829d07dcc65b5496aa1a4780f31fdd260cfc2a5 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.cpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp
@@ -79,6 +79,10 @@ viewer_status_to_ctf_msg_iter_medium_status(enum lttng_live_viewer_status viewer
 
 static inline void viewer_connection_close_socket(struct live_viewer_connection *viewer_connection)
 {
+    if (viewer_connection->control_sock == BT_INVALID_SOCKET) {
+        return;
+    }
+
     int ret = bt_socket_close(viewer_connection->control_sock);
     if (ret == -1) {
         BT_CPPLOGW_ERRNO_SPEC(viewer_connection->logger,
@@ -404,29 +408,12 @@ lttng_live_connect_viewer(struct live_viewer_connection *viewer_connection)
     goto end;
 
 error:
-    if (viewer_connection->control_sock != BT_INVALID_SOCKET) {
-        if (bt_socket_close(viewer_connection->control_sock) == BT_SOCKET_ERROR) {
-            BT_CPPLOGW_SPEC(viewer_connection->logger, "Error closing socket: {}.",
-                            bt_socket_errormsg());
-        }
-    }
-    viewer_connection->control_sock = BT_INVALID_SOCKET;
+    viewer_connection_close_socket(viewer_connection);
+
 end:
     return status;
 }
 
-static void lttng_live_disconnect_viewer(struct live_viewer_connection *viewer_connection)
-{
-    if (viewer_connection->control_sock == BT_INVALID_SOCKET) {
-        return;
-    }
-    if (bt_socket_close(viewer_connection->control_sock) == BT_SOCKET_ERROR) {
-        BT_CPPLOGW_SPEC(viewer_connection->logger, "Error closing socket: {}",
-                        bt_socket_errormsg());
-        viewer_connection->control_sock = BT_INVALID_SOCKET;
-    }
-}
-
 static int list_update_session(const bt2::ArrayValue results,
                                const struct lttng_viewer_session *session, bool *_found,
                                struct live_viewer_connection *viewer_connection)
@@ -1548,7 +1535,7 @@ live_viewer_connection::~live_viewer_connection()
 {
     BT_CPPLOGD_SPEC(this->logger, "Closing connection to relay: relay-url=\"{}\"", this->url);
 
-    lttng_live_disconnect_viewer(this);
+    viewer_connection_close_socket(this);
 
     bt_socket_fini();
 }