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>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12386
Tested-by: jenkins <jenkins@lttng.org>
}
if (lttng_live_msg_iter->viewer_connection) {
}
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);
}
BT_ASSERT(lttng_live_msg_iter->lttng_live_comp);
BT_ASSERT(lttng_live_msg_iter->lttng_live_comp->has_msg_iter);
- if (viewer_connection) {
- live_viewer_connection_destroy(viewer_connection);
- }
+ delete viewer_connection;
- if (viewer_connection) {
- live_viewer_connection_destroy(viewer_connection);
- }
+ delete viewer_connection;
+
-void live_viewer_connection_destroy(struct live_viewer_connection *viewer_connection)
+live_viewer_connection::~live_viewer_connection()
- if (!viewer_connection) {
- goto end;
- }
+ BT_CPPLOGD_SPEC(this->logger, "Closing connection to relay: relay-url=\"{}\"", this->url);
- BT_CPPLOGD_SPEC(viewer_connection->logger, "Closing connection to relay: relay-url=\"{}\"",
- viewer_connection->url);
-
- lttng_live_disconnect_viewer(viewer_connection);
-
- delete viewer_connection;
+ lttng_live_disconnect_viewer(this);
+ ~live_viewer_connection();
+
bt2c::Logger logger;
std::string url;
bt2c::Logger logger;
std::string url;
const char *url, bool in_query, struct lttng_live_msg_iter *lttng_live_msg_iter,
const bt2c::Logger& parentLogger, struct live_viewer_connection **viewer);
const char *url, bool in_query, struct lttng_live_msg_iter *lttng_live_msg_iter,
const bt2c::Logger& parentLogger, 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);
enum lttng_live_viewer_status
lttng_live_create_viewer_session(struct lttng_live_msg_iter *lttng_live_msg_iter);