#include "common/common.h"
#include "compat/endian.h" /* IWYU pragma: keep */
+#include "cpp-common/bt2s/make-unique.hpp"
#include "data-stream.hpp"
#include "lttng-live.hpp"
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,
{
char error_buf[256] = {0};
struct bt_common_lttng_live_url_parts lttng_live_url_parts = {};
+ bt_common_lttng_live_url_parts_deleter partsDeleter {lttng_live_url_parts};
int ret = -1;
- const char *path = viewer_connection->url->str;
- if (!path) {
+ if (viewer_connection->url.empty()) {
goto end;
}
- lttng_live_url_parts = bt_common_parse_lttng_live_url(path, error_buf, sizeof(error_buf));
+ lttng_live_url_parts = bt_common_parse_lttng_live_url(viewer_connection->url.c_str(), error_buf,
+ sizeof(error_buf));
if (!lttng_live_url_parts.proto) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Invalid LTTng live URL format: {}",
error_buf);
goto end;
}
- viewer_connection->proto = lttng_live_url_parts.proto;
+ viewer_connection->proto.reset(lttng_live_url_parts.proto);
lttng_live_url_parts.proto = NULL;
- viewer_connection->relay_hostname = lttng_live_url_parts.hostname;
+ viewer_connection->relay_hostname.reset(lttng_live_url_parts.hostname);
lttng_live_url_parts.hostname = NULL;
if (lttng_live_url_parts.port >= 0) {
viewer_connection->port = LTTNG_DEFAULT_NETWORK_VIEWER_PORT;
}
- viewer_connection->target_hostname = lttng_live_url_parts.target_hostname;
+ viewer_connection->target_hostname.reset(lttng_live_url_parts.target_hostname);
lttng_live_url_parts.target_hostname = NULL;
if (lttng_live_url_parts.session_name) {
- viewer_connection->session_name = lttng_live_url_parts.session_name;
+ viewer_connection->session_name.reset(lttng_live_url_parts.session_name);
lttng_live_url_parts.session_name = NULL;
}
ret = 0;
end:
- bt_common_destroy_lttng_live_url_parts(<tng_live_url_parts);
return ret;
}
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(bt_value *results, const struct lttng_viewer_session *session,
- bool *_found, struct live_viewer_connection *viewer_connection)
+static int list_update_session(const bt2::ArrayValue results,
+ const struct lttng_viewer_session *session, bool *_found,
+ struct live_viewer_connection *viewer_connection)
{
- int ret = 0;
- uint64_t i, len;
- bt_value *map = NULL;
- bt_value *hostname = NULL;
- bt_value *session_name = NULL;
- bt_value *btval = NULL;
bool found = false;
- len = bt_value_array_get_length(results);
- for (i = 0; i < len; i++) {
- const char *hostname_str = NULL;
- const char *session_name_str = NULL;
+ for (const auto value : results) {
+ const auto map = value.asMap();
+ const auto hostnameVal = map["target-hostname"];
- map = bt_value_array_borrow_element_by_index(results, i);
- hostname = bt_value_map_borrow_entry_value(map, "target-hostname");
- if (!hostname) {
+ if (!hostnameVal) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
"Error borrowing \"target-hostname\" entry.");
- ret = -1;
- goto end;
+ return -1;
}
- session_name = bt_value_map_borrow_entry_value(map, "session-name");
- if (!session_name) {
+
+ const auto sessionNameVal = map["session-name"];
+
+ if (!sessionNameVal) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
"Error borrowing \"session-name\" entry.");
- ret = -1;
- goto end;
+ return -1;
}
- hostname_str = bt_value_string_get(hostname);
- session_name_str = bt_value_string_get(session_name);
+
+ const auto hostname_str = hostnameVal->asString().value();
+ const auto session_name_str = sessionNameVal->asString().value();
if (strcmp(session->hostname, hostname_str) == 0 &&
strcmp(session->session_name, session_name_str) == 0) {
- int64_t val;
uint32_t streams = be32toh(session->streams);
uint32_t clients = be32toh(session->clients);
found = true;
- btval = bt_value_map_borrow_entry_value(map, "stream-count");
- if (!btval) {
+ const auto streamCountVal = map["stream-count"];
+
+ if (!streamCountVal) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
"Error borrowing \"stream-count\" entry.");
- ret = -1;
- goto end;
+ return -1;
}
- val = bt_value_integer_unsigned_get(btval);
+
+ auto val = streamCountVal->asUnsignedInteger().value();
+
/* sum */
val += streams;
- bt_value_integer_unsigned_set(btval, val);
+ streamCountVal->asUnsignedInteger().value(val);
- btval = bt_value_map_borrow_entry_value(map, "client-count");
- if (!btval) {
+ const auto clientCountVal = map["client-count"];
+
+ if (!clientCountVal) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
"Error borrowing \"client-count\" entry.");
- ret = -1;
- goto end;
+ return -1;
}
- val = bt_value_integer_unsigned_get(btval);
+
+ val = clientCountVal->asUnsignedInteger().value();
+
/* max */
- val = bt_max_t(int64_t, clients, val);
- bt_value_integer_unsigned_set(btval, val);
+ val = std::max<uint64_t>(clients, val);
+ clientCountVal->asUnsignedInteger().value(val);
}
if (found) {
break;
}
}
-end:
+
*_found = found;
- return ret;
+ return 0;
}
-static int list_append_session(bt_value *results, GString *base_url,
+static int list_append_session(const bt2::ArrayValue results, const std::string& base_url,
const struct lttng_viewer_session *session,
struct live_viewer_connection *viewer_connection)
{
int ret = 0;
- bt_value_map_insert_entry_status insert_status;
- bt_value_array_append_element_status append_status;
- bt_value *map = NULL;
- GString *url = NULL;
bool found = false;
/*
*/
ret = list_update_session(results, session, &found, viewer_connection);
if (ret || found) {
- goto end;
+ return ret;
}
- map = bt_value_map_create();
- if (!map) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error creating map value.");
- ret = -1;
- goto end;
- }
+ const auto map = bt2::MapValue::create();
- if (base_url->len < 1) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error: base_url length smaller than 1.");
- ret = -1;
- goto end;
+ if (base_url.empty()) {
+ BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error: base_url empty.");
+ return -1;
}
+
/*
* key = "url",
* value = <string>,
*/
- url = g_string_new(base_url->str);
- g_string_append(url, "/host/");
- g_string_append(url, session->hostname);
- g_string_append_c(url, '/');
- g_string_append(url, session->session_name);
-
- insert_status = bt_value_map_insert_string_entry(map, "url", url->str);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error inserting \"url\" entry.");
- ret = -1;
- goto end;
- }
+ map->insert("url",
+ fmt::format("{}/host/{}/{}", base_url, session->hostname, session->session_name));
/*
* key = "target-hostname",
* value = <string>,
*/
- insert_status = bt_value_map_insert_string_entry(map, "target-hostname", session->hostname);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error inserting \"target-hostname\" entry.");
- ret = -1;
- goto end;
- }
+ map->insert("target-hostname", session->hostname);
/*
* key = "session-name",
* value = <string>,
*/
- insert_status = bt_value_map_insert_string_entry(map, "session-name", session->session_name);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error inserting \"session-name\" entry.");
- ret = -1;
- goto end;
- }
+ map->insert("session-name", session->session_name);
/*
* key = "timer-us",
{
uint32_t live_timer = be32toh(session->live_timer);
- insert_status = bt_value_map_insert_unsigned_integer_entry(map, "timer-us", live_timer);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error inserting \"timer-us\" entry.");
- ret = -1;
- goto end;
- }
+ map->insert("timer-us", (uint64_t) live_timer);
}
/*
{
uint32_t streams = be32toh(session->streams);
- insert_status = bt_value_map_insert_unsigned_integer_entry(map, "stream-count", streams);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error inserting \"stream-count\" entry.");
- ret = -1;
- goto end;
- }
+ map->insert("stream-count", (uint64_t) streams);
}
/*
{
uint32_t clients = be32toh(session->clients);
- insert_status = bt_value_map_insert_unsigned_integer_entry(map, "client-count", clients);
- if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error inserting \"client-count\" entry.");
- ret = -1;
- goto end;
- }
- }
-
- append_status = bt_value_array_append_element(results, map);
- if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error appending map to results.");
- ret = -1;
+ map->insert("client-count", (uint64_t) clients);
}
-end:
- if (url) {
- g_string_free(url, true);
- }
- BT_VALUE_PUT_REF_AND_RESET(map);
- return ret;
+ results.append(*map);
+ return 0;
}
/*
* }
*/
-bt_component_class_query_method_status
-live_viewer_connection_list_sessions(struct live_viewer_connection *viewer_connection,
- const bt_value **user_result)
+bt2::Value::Shared
+live_viewer_connection_list_sessions(struct live_viewer_connection *viewer_connection)
{
- bt_component_class_query_method_status status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
- bt_value *result = NULL;
enum lttng_live_viewer_status viewer_status;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_list_sessions list;
uint32_t i, sessions_count;
-
- result = bt_value_array_create();
- if (!result) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error creating array");
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_MEMORY_ERROR;
- goto error;
- }
+ auto result = bt2::ArrayValue::create();
BT_CPPLOGD_SPEC(viewer_connection->logger, "Requesting list of sessions: cmd={}",
LTTNG_VIEWER_LIST_SESSIONS);
viewer_status = lttng_live_send(viewer_connection, &cmd, sizeof(cmd));
if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_ERROR) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Error sending list sessions command");
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(viewer_connection->logger, bt2::Error,
+ "Error sending list sessions command");
} else if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED) {
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_AGAIN;
- goto error;
+ throw bt2c::TryAgain {};
}
viewer_status = lttng_live_recv(viewer_connection, &list, sizeof(list));
if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_ERROR) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error receiving session list");
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(viewer_connection->logger, bt2::Error,
+ "Error receiving session list");
} else if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED) {
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_AGAIN;
- goto error;
+ throw bt2c::TryAgain {};
}
sessions_count = be32toh(list.sessions_count);
viewer_status = lttng_live_recv(viewer_connection, &lsession, sizeof(lsession));
if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_ERROR) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error receiving session:");
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
- goto error;
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(viewer_connection->logger, bt2::Error,
+ "Error receiving session:");
} else if (viewer_status == LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED) {
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_AGAIN;
- goto error;
+ throw bt2c::TryAgain {};
}
lsession.hostname[LTTNG_VIEWER_HOST_NAME_MAX - 1] = '\0';
lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
- if (list_append_session(result, viewer_connection->url, &lsession, viewer_connection)) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Error appending session");
- status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
- goto error;
+ if (list_append_session(*result, viewer_connection->url, &lsession, viewer_connection)) {
+ BT_CPPLOGE_APPEND_CAUSE_AND_THROW_SPEC(viewer_connection->logger, bt2::Error,
+ "Error appending session");
}
}
- *user_result = result;
- goto end;
-error:
- BT_VALUE_PUT_REF_AND_RESET(result);
-end:
- return status;
+ return result;
}
static enum lttng_live_viewer_status
uint32_t i, sessions_count;
uint64_t session_id;
enum lttng_live_viewer_status status;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
BT_CPPLOGD_SPEC(viewer_connection->logger,
"Asking the relay daemon for the list of sessions: cmd={}",
struct lttng_viewer_cmd cmd;
struct lttng_viewer_create_session_response resp;
enum lttng_live_viewer_status status;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
BT_CPPLOGD_SPEC(viewer_connection->logger, "Creating a viewer session: cmd={}",
LTTNG_VIEWER_CREATE_SESSION);
uint32_t i;
struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
enum lttng_live_viewer_status status;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
BT_CPPLOGI_SPEC(viewer_connection->logger, "Getting {} new streams", stream_count);
for (i = 0; i < stream_count; i++) {
struct lttng_viewer_attach_session_request rq;
struct lttng_viewer_attach_session_response rp;
struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
uint64_t session_id = session->id;
uint32_t streams_count;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
struct lttng_viewer_detach_session_request rq;
struct lttng_viewer_detach_session_response rp;
struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
uint64_t session_id = session->id;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
}
enum lttng_live_get_one_metadata_status
-lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace, FILE *fp, size_t *reply_len)
+lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace, std::vector<char>& buf)
{
uint64_t len = 0;
enum lttng_live_get_one_metadata_status status;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_metadata rq;
struct lttng_viewer_metadata_packet rp;
- gchar *data = NULL;
- ssize_t writelen;
+ std::vector<char> data;
struct lttng_live_session *session = trace->session;
struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
- struct lttng_live_metadata *metadata = trace->metadata;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ struct lttng_live_metadata *metadata = trace->metadata.get();
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
goto end;
}
- data = g_new0(gchar, len);
- if (!data) {
- BT_CPPLOGE_ERRNO_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Failed to allocate data buffer", ".");
- status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
- goto end;
- }
+ data.resize(len);
- viewer_status = lttng_live_recv(viewer_connection, data, len);
+ viewer_status = lttng_live_recv(viewer_connection, data.data(), len);
if (viewer_status != LTTNG_LIVE_VIEWER_STATUS_OK) {
viewer_handle_recv_status(viewer_status, "get metadata packet");
status = (enum lttng_live_get_one_metadata_status) viewer_status;
/*
* Write the metadata to the file handle.
*/
- writelen = fwrite(data, sizeof(uint8_t), len, fp);
- if (writelen != len) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger,
- "Writing in the metadata file stream");
- status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
- goto end;
- }
+ buf.insert(buf.end(), data.begin(), data.end());
empty_metadata_packet_retry:
- *reply_len = len;
status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK;
end:
- g_free(data);
return status;
}
static void lttng_live_need_new_streams(struct lttng_live_msg_iter *lttng_live_msg_iter)
{
- uint64_t session_idx;
-
- for (session_idx = 0; session_idx < lttng_live_msg_iter->sessions->len; session_idx++) {
- struct lttng_live_session *session =
- (lttng_live_session *) g_ptr_array_index(lttng_live_msg_iter->sessions, session_idx);
+ for (const auto& session : lttng_live_msg_iter->sessions) {
BT_CPPLOGD_SPEC(lttng_live_msg_iter->logger,
"Marking session as needing new streams: "
"session-id={}",
enum lttng_live_viewer_status viewer_status;
struct lttng_viewer_index rp;
enum lttng_live_iterator_status status;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
struct lttng_live_trace *trace = stream->trace;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
struct lttng_viewer_trace_packet rp;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_packet rq;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
struct lttng_live_trace *trace = stream->trace;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
struct lttng_viewer_new_streams_response rp;
struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
enum lttng_live_viewer_status viewer_status;
- struct live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection;
+ live_viewer_connection *viewer_connection = lttng_live_msg_iter->viewer_connection.get();
uint32_t streams_count;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
return status;
}
-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 bt2c::Logger& parentLogger, struct live_viewer_connection **viewer)
+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 bt2c::Logger& parentLogger, live_viewer_connection::UP& viewer)
{
- enum lttng_live_viewer_status status;
-
- live_viewer_connection *viewer_connection = new live_viewer_connection {parentLogger};
+ auto viewer_connection = bt2s::make_unique<live_viewer_connection>(parentLogger);
if (bt_socket_init(viewer_connection->logger) != 0) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Failed to init socket");
- status = LTTNG_LIVE_VIEWER_STATUS_ERROR;
- goto error;
+ return LTTNG_LIVE_VIEWER_STATUS_ERROR;
}
viewer_connection->control_sock = BT_INVALID_SOCKET;
viewer_connection->port = -1;
viewer_connection->in_query = in_query;
viewer_connection->lttng_live_msg_iter = lttng_live_msg_iter;
- viewer_connection->url = g_string_new(url);
- if (!viewer_connection->url) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(viewer_connection->logger, "Failed to allocate URL buffer");
- status = LTTNG_LIVE_VIEWER_STATUS_ERROR;
- goto error;
- }
+ viewer_connection->url = url;
BT_CPPLOGD_SPEC(viewer_connection->logger, "Establishing connection to url \"{}\"...", url);
- status = lttng_live_connect_viewer(viewer_connection);
+ const auto status = lttng_live_connect_viewer(viewer_connection.get());
+
/*
* Only print error and append cause in case of error. not in case of
* interruption.
"Failed to establish connection: "
"url=\"{}\"",
url);
- goto error;
+ return status;
} else if (status == LTTNG_LIVE_VIEWER_STATUS_INTERRUPTED) {
- goto error;
+ return status;
}
BT_CPPLOGD_SPEC(viewer_connection->logger, "Connection to url \"{}\" is established", url);
- *viewer = viewer_connection;
- status = LTTNG_LIVE_VIEWER_STATUS_OK;
- goto end;
-
-error:
- if (viewer_connection) {
- live_viewer_connection_destroy(viewer_connection);
- }
-end:
- return status;
+ viewer = std::move(viewer_connection);
+ return LTTNG_LIVE_VIEWER_STATUS_OK;
}
-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->str);
-
- lttng_live_disconnect_viewer(viewer_connection);
-
- if (viewer_connection->url) {
- g_string_free(viewer_connection->url, true);
- }
-
- if (viewer_connection->relay_hostname) {
- g_string_free(viewer_connection->relay_hostname, true);
- }
-
- if (viewer_connection->target_hostname) {
- g_string_free(viewer_connection->target_hostname, true);
- }
-
- if (viewer_connection->session_name) {
- g_string_free(viewer_connection->session_name, true);
- }
-
- if (viewer_connection->proto) {
- g_string_free(viewer_connection->proto, true);
- }
-
- delete viewer_connection;
+ viewer_connection_close_socket(this);
bt_socket_fini();
-
-end:
- return;
}
projects / babeltrace.git / blobdiff