* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP (viewer_connection->self_comp)
#define BT_LOG_OUTPUT_LEVEL (viewer_connection->log_level)
#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
-#include "logging/log.h"
+#include "logging/comp-logging.h"
#include <stdio.h>
#include <stdint.h>
}
if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
if (!viewer_connection->in_query &&
- lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+ lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
break;
} else {
continue;
}
}
} while (ret > 0 && to_copy > 0);
- if (ret > 0)
+
+ if (ret > 0) {
ret = copied;
+ }
+
/* ret = 0 means orderly shutdown, ret == BT_SOCKET_ERROR is error. */
return ret;
}
ret = bt_socket_send_nosigpipe(sock, buf, len);
if (ret == BT_SOCKET_ERROR && bt_socket_interrupted()) {
if (!viewer_connection->in_query &&
- lttng_live_graph_is_canceled(lttng_live_msg_iter->lttng_live_comp)) {
+ lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
break;
} else {
continue;
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(path, error_buf,
+ sizeof(error_buf));
if (!lttng_live_url_parts.proto) {
- BT_LOGW("Invalid LTTng live URL format: %s", error_buf);
+ BT_COMP_LOGW("Invalid LTTng live URL format: %s", error_buf);
goto end;
}
- viewer_connection->relay_hostname =
- lttng_live_url_parts.hostname;
+ viewer_connection->relay_hostname = 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 = 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 = lttng_live_url_parts.session_name;
lttng_live_url_parts.session_name = NULL;
}
- BT_LOGI("Connecting to hostname : %s, port : %d, "
- "target hostname : %s, session name : %s, "
- "proto : %s",
- viewer_connection->relay_hostname->str,
- viewer_connection->port,
- viewer_connection->target_hostname == NULL ?
- "<none>" : viewer_connection->target_hostname->str,
- viewer_connection->session_name == NULL ?
- "<none>" : viewer_connection->session_name->str,
- lttng_live_url_parts.proto->str);
+ BT_COMP_LOGI("Connecting to hostname : %s, port : %d, "
+ "target hostname : %s, session name : %s, proto : %s",
+ viewer_connection->relay_hostname->str,
+ viewer_connection->port,
+ !viewer_connection->target_hostname ?
+ "<none>" : viewer_connection->target_hostname->str,
+ !viewer_connection->session_name ?
+ "<none>" : viewer_connection->session_name->str,
+ lttng_live_url_parts.proto->str);
ret = 0;
end:
memcpy(cmd_buf + sizeof(cmd), &connect, sizeof(connect));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending version: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending version: %s", bt_socket_errormsg());
goto error;
}
ret_len = lttng_live_recv(viewer_connection, &connect, sizeof(connect));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving version: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving version: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(connect));
- BT_LOGI("Received viewer session ID : %" PRIu64,
+ BT_COMP_LOGI("Received viewer session ID : %" PRIu64,
(uint64_t) be64toh(connect.viewer_session_id));
- BT_LOGI("Relayd version : %u.%u", be32toh(connect.major),
+ BT_COMP_LOGI("Relayd version : %u.%u", be32toh(connect.major),
be32toh(connect.minor));
if (LTTNG_LIVE_MAJOR != be32toh(connect.major)) {
- BT_LOGE("Incompatible lttng-relayd protocol");
+ BT_COMP_LOGE("Incompatible lttng-relayd protocol");
goto error;
}
/* Use the smallest protocol version implemented. */
return ret;
error:
- BT_LOGE("Unable to establish connection");
+ BT_COMP_LOGE("Unable to establish connection");
return -1;
}
host = gethostbyname(viewer_connection->relay_hostname->str);
if (!host) {
- BT_LOGE("Cannot lookup hostname %s",
+ BT_COMP_LOGE("Cannot lookup hostname %s",
viewer_connection->relay_hostname->str);
goto error;
}
if ((viewer_connection->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == BT_INVALID_SOCKET) {
- BT_LOGE("Socket creation failed: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Socket creation failed: %s", bt_socket_errormsg());
goto error;
}
if (connect(viewer_connection->control_sock, (struct sockaddr *) &server_addr,
sizeof(struct sockaddr)) == BT_SOCKET_ERROR) {
- BT_LOGE("Connection failed: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Connection failed: %s", bt_socket_errormsg());
goto error;
}
if (lttng_live_handshake(viewer_connection)) {
error:
if (viewer_connection->control_sock != BT_INVALID_SOCKET) {
if (bt_socket_close(viewer_connection->control_sock) == BT_SOCKET_ERROR) {
- BT_LOGE("Close: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Close: %s", bt_socket_errormsg());
}
}
viewer_connection->control_sock = BT_INVALID_SOCKET;
return;
}
if (bt_socket_close(viewer_connection->control_sock) == BT_SOCKET_ERROR) {
- BT_LOGE("Close: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Close: %s", bt_socket_errormsg());
viewer_connection->control_sock = BT_INVALID_SOCKET;
}
}
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;
- int i, len;
bool found = false;
- len = bt_value_array_get_size(results);
- if (len < 0) {
- BT_LOGE_STR("Error getting size of array.");
- ret = -1;
- goto end;
- }
+ len = bt_value_array_get_length(results);
for (i = 0; i < len; i++) {
const char *hostname_str = NULL;
const char *session_name_str = NULL;
- map = bt_value_array_borrow_element_by_index(results, (size_t) i);
- if (!map) {
- BT_LOGE_STR("Error borrowing map.");
- ret = -1;
- goto end;
- }
+ map = bt_value_array_borrow_element_by_index(results, i);
hostname = bt_value_map_borrow_entry_value(map, "target-hostname");
if (!hostname) {
- BT_LOGE_STR("Error borrowing \"target-hostname\" entry.");
+ BT_COMP_LOGE_STR("Error borrowing \"target-hostname\" entry.");
ret = -1;
goto end;
}
session_name = bt_value_map_borrow_entry_value(map, "session-name");
if (!session_name) {
- BT_LOGE_STR("Error borrowing \"session-name\" entry.");
+ BT_COMP_LOGE_STR("Error borrowing \"session-name\" entry.");
ret = -1;
goto end;
}
hostname_str = bt_value_string_get(hostname);
session_name_str = bt_value_string_get(session_name);
- if (!strcmp(session->hostname, hostname_str)
- && !strcmp(session->session_name,
- session_name_str)) {
+ 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);
btval = bt_value_map_borrow_entry_value(map, "stream-count");
if (!btval) {
- BT_LOGE_STR("Error borrowing \"stream-count\" entry.");
+ BT_COMP_LOGE_STR("Error borrowing \"stream-count\" entry.");
ret = -1;
goto end;
}
- val = bt_value_signed_integer_get(btval);
+ val = bt_value_integer_unsigned_get(btval);
/* sum */
val += streams;
- bt_value_signed_integer_set(btval, val);
+ bt_value_integer_unsigned_set(btval, val);
btval = bt_value_map_borrow_entry_value(map, "client-count");
if (!btval) {
- BT_LOGE_STR("Error borrowing \"client-count\" entry.");
+ BT_COMP_LOGE_STR("Error borrowing \"client-count\" entry.");
ret = -1;
goto end;
}
- val = bt_value_signed_integer_get(btval);
+ val = bt_value_integer_unsigned_get(btval);
/* max */
val = bt_max_t(int64_t, clients, val);
- bt_value_signed_integer_set(btval, val);
+ bt_value_integer_unsigned_set(btval, val);
}
if (found) {
struct live_viewer_connection *viewer_connection)
{
int ret = 0;
- bt_value_status ret_status;
+ 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;
map = bt_value_map_create();
if (!map) {
- BT_LOGE_STR("Error creating map value.");
+ BT_COMP_LOGE_STR("Error creating map value.");
ret = -1;
goto end;
}
if (base_url->len < 1) {
- BT_LOGE_STR("Error: base_url length smaller than 1.");
+ BT_COMP_LOGE_STR("Error: base_url length smaller than 1.");
ret = -1;
goto end;
}
g_string_append_c(url, '/');
g_string_append(url, session->session_name);
- ret_status = bt_value_map_insert_string_entry(map, "url", url->str);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"url\" entry.");
+ insert_status = bt_value_map_insert_string_entry(map, "url", url->str);
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"url\" entry.");
ret = -1;
goto end;
}
* key = "target-hostname",
* value = <string>,
*/
- ret_status = bt_value_map_insert_string_entry(map, "target-hostname",
+ insert_status = bt_value_map_insert_string_entry(map, "target-hostname",
session->hostname);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"target-hostname\" entry.");
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"target-hostname\" entry.");
ret = -1;
goto end;
}
* key = "session-name",
* value = <string>,
*/
- ret_status = bt_value_map_insert_string_entry(map, "session-name",
+ insert_status = bt_value_map_insert_string_entry(map, "session-name",
session->session_name);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"session-name\" entry.");
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"session-name\" entry.");
ret = -1;
goto end;
}
{
uint32_t live_timer = be32toh(session->live_timer);
- ret_status = bt_value_map_insert_signed_integer_entry(
+ insert_status = bt_value_map_insert_unsigned_integer_entry(
map, "timer-us", live_timer);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"timer-us\" entry.");
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"timer-us\" entry.");
ret = -1;
goto end;
}
{
uint32_t streams = be32toh(session->streams);
- ret_status = bt_value_map_insert_signed_integer_entry(map,
+ insert_status = bt_value_map_insert_unsigned_integer_entry(map,
"stream-count", streams);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"stream-count\" entry.");
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"stream-count\" entry.");
ret = -1;
goto end;
}
{
uint32_t clients = be32toh(session->clients);
- ret_status = bt_value_map_insert_signed_integer_entry(map,
+ insert_status = bt_value_map_insert_unsigned_integer_entry(map,
"client-count", clients);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error inserting \"client-count\" entry.");
+ if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error inserting \"client-count\" entry.");
ret = -1;
goto end;
}
}
- ret_status = bt_value_array_append_element(results, map);
- if (ret_status != BT_VALUE_STATUS_OK) {
- BT_LOGE_STR("Error appending map to results.");
+ append_status = bt_value_array_append_element(results, map);
+ if (append_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
+ BT_COMP_LOGE_STR("Error appending map to results.");
ret = -1;
}
*/
BT_HIDDEN
-bt_query_status live_viewer_connection_list_sessions(
+bt_component_class_query_method_status live_viewer_connection_list_sessions(
struct live_viewer_connection *viewer_connection,
const bt_value **user_result)
{
- bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_component_class_query_method_status status =
+ BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
bt_value *result = NULL;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_list_sessions list;
uint32_t i, sessions_count;
ssize_t ret_len;
- if (lttng_live_handshake(viewer_connection)) {
- goto error;
- }
-
result = bt_value_array_create();
if (!result) {
- BT_LOGE("Error creating array");
- status = BT_QUERY_STATUS_NOMEM;
+ BT_COMP_LOGE("Error creating array");
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
ret_len = lttng_live_send(viewer_connection, &cmd, sizeof(cmd));
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
- status = BT_QUERY_STATUS_ERROR;
+ BT_COMP_LOGE("Error sending cmd: %s", bt_socket_errormsg());
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
BT_ASSERT(ret_len == sizeof(cmd));
ret_len = lttng_live_recv(viewer_connection, &list, sizeof(list));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
- status = BT_QUERY_STATUS_ERROR;
+ BT_COMP_LOGI("Remote side has closed connection");
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving session list: %s", bt_socket_errormsg());
- status = BT_QUERY_STATUS_ERROR;
+ BT_COMP_LOGE("Error receiving session list: %s", bt_socket_errormsg());
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
BT_ASSERT(ret_len == sizeof(list));
ret_len = lttng_live_recv(viewer_connection, &lsession,
sizeof(lsession));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
- status = BT_QUERY_STATUS_ERROR;
+ BT_COMP_LOGI("Remote side has closed connection");
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving session: %s", bt_socket_errormsg());
- status = BT_QUERY_STATUS_ERROR;
+ BT_COMP_LOGE("Error receiving session: %s", bt_socket_errormsg());
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
BT_ASSERT(ret_len == sizeof(lsession));
lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
if (list_append_session(result, viewer_connection->url,
&lsession, viewer_connection)) {
- status = BT_QUERY_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
goto error;
}
}
ret_len = lttng_live_send(viewer_connection, &cmd, sizeof(cmd));
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending cmd: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(cmd));
ret_len = lttng_live_recv(viewer_connection, &list, sizeof(list));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving session list: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving session list: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(list));
ret_len = lttng_live_recv(viewer_connection,
&lsession, sizeof(lsession));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving session: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving session: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(lsession));
lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
session_id = be64toh(lsession.id);
- BT_LOGI("Adding session %" PRIu64 " hostname: %s session_name: %s",
+ BT_COMP_LOGI("Adding session %" PRIu64 " hostname: %s session_name: %s",
session_id, lsession.hostname, lsession.session_name);
if ((strncmp(lsession.session_name,
return 0;
error:
- BT_LOGE("Unable to query session ids");
+ BT_COMP_LOGE("Unable to query session ids");
return -1;
}
ret_len = lttng_live_send(viewer_connection, &cmd, sizeof(cmd));
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending cmd: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(cmd));
ret_len = lttng_live_recv(viewer_connection, &resp, sizeof(resp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving create session reply: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving create session reply: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(resp));
if (be32toh(resp.status) != LTTNG_VIEWER_CREATE_SESSION_OK) {
- BT_LOGE("Error creating viewer session");
+ BT_COMP_LOGE("Error creating viewer session");
goto error;
}
if (lttng_live_query_session_ids(lttng_live_msg_iter)) {
ssize_t ret_len;
uint32_t i;
struct lttng_live_msg_iter *lttng_live_msg_iter =
- session->lttng_live_msg_iter;
+ session->lttng_live_msg_iter;
struct live_viewer_connection *viewer_connection =
- lttng_live_msg_iter->viewer_connection;
+ lttng_live_msg_iter->viewer_connection;
- BT_LOGI("Getting %" PRIu32 " new streams:", stream_count);
+ BT_COMP_LOGI("Getting %" PRIu32 " new streams:", stream_count);
for (i = 0; i < stream_count; i++) {
struct lttng_viewer_stream stream;
struct lttng_live_stream_iterator *live_stream;
ret_len = lttng_live_recv(viewer_connection, &stream, sizeof(stream));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving stream");
+ BT_COMP_LOGE("Error receiving stream");
goto error;
}
BT_ASSERT(ret_len == sizeof(stream));
ctf_trace_id = be64toh(stream.ctf_trace_id);
if (stream.metadata_flag) {
- BT_LOGI(" metadata stream %" PRIu64 " : %s/%s",
- stream_id, stream.path_name,
- stream.channel_name);
+ BT_COMP_LOGI(" metadata stream %" PRIu64 " : %s/%s",
+ stream_id, stream.path_name, stream.channel_name);
if (lttng_live_metadata_create_stream(session,
ctf_trace_id, stream_id,
stream.path_name)) {
- BT_LOGE("Error creating metadata stream");
+ BT_COMP_LOGE("Error creating metadata stream");
goto error;
}
session->lazy_stream_msg_init = true;
} else {
- BT_LOGI(" stream %" PRIu64 " : %s/%s",
- stream_id, stream.path_name,
- stream.channel_name);
+ BT_COMP_LOGI(" stream %" PRIu64 " : %s/%s",
+ stream_id, stream.path_name, stream.channel_name);
live_stream = lttng_live_stream_iterator_create(session,
ctf_trace_id, stream_id);
if (!live_stream) {
- BT_LOGE("Error creating streamn");
+ BT_COMP_LOGE("Error creating streamn");
goto error;
}
}
}
BT_HIDDEN
-int lttng_live_attach_session(struct lttng_live_session *session)
+enum lttng_live_attach_session_status lttng_live_attach_session(
+ struct lttng_live_session *session)
{
struct lttng_viewer_cmd cmd;
+ enum lttng_live_attach_session_status attach_status;
struct lttng_viewer_attach_session_request rq;
struct lttng_viewer_attach_session_response rp;
- ssize_t ret_len;
- struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
+ 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;
+ lttng_live_msg_iter->viewer_connection;
uint64_t session_id = session->id;
uint32_t streams_count;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
+ ssize_t ret_len;
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
cmd.data_size = htobe64((uint64_t) sizeof(rq));
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending attach request: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending attach request: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving attach response: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving attach response: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(rp));
case LTTNG_VIEWER_ATTACH_OK:
break;
case LTTNG_VIEWER_ATTACH_UNK:
- BT_LOGW("Session id %" PRIu64 " is unknown", session_id);
+ BT_COMP_LOGW("Session id %" PRIu64 " is unknown", session_id);
goto error;
case LTTNG_VIEWER_ATTACH_ALREADY:
- BT_LOGW("There is already a viewer attached to this session");
+ BT_COMP_LOGW("There is already a viewer attached to this session");
goto error;
case LTTNG_VIEWER_ATTACH_NOT_LIVE:
- BT_LOGW("Not a live session");
+ BT_COMP_LOGW("Not a live session");
goto error;
case LTTNG_VIEWER_ATTACH_SEEK_ERR:
- BT_LOGE("Wrong seek parameter");
+ BT_COMP_LOGE("Wrong seek parameter");
goto error;
default:
- BT_LOGE("Unknown attach return code %u", be32toh(rp.status));
+ BT_COMP_LOGE("Unknown attach return code %u", be32toh(rp.status));
goto error;
}
session->attached = true;
session->new_streams_needed = false;
- return 0;
+ attach_status = LTTNG_LIVE_ATTACH_SESSION_STATUS_OK;
+ goto end;
error:
- return -1;
+ attach_status = LTTNG_LIVE_ATTACH_SESSION_STATUS_ERROR;
+
+end:
+ return attach_status;
}
BT_HIDDEN
struct lttng_viewer_detach_session_request rq;
struct lttng_viewer_detach_session_response rp;
ssize_t ret_len;
- struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
+ 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;
+ lttng_live_msg_iter->viewer_connection;
uint64_t session_id = session->id;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending detach request: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending detach request: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving detach response: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving detach response: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(rp));
case LTTNG_VIEWER_DETACH_SESSION_OK:
break;
case LTTNG_VIEWER_DETACH_SESSION_UNK:
- BT_LOGW("Session id %" PRIu64 " is unknown", session_id);
+ BT_COMP_LOGW("Session id %" PRIu64 " is unknown", session_id);
goto error;
case LTTNG_VIEWER_DETACH_SESSION_ERR:
- BT_LOGW("Error detaching session id %" PRIu64 "", session_id);
+ BT_COMP_LOGW("Error detaching session id %" PRIu64 "", session_id);
goto error;
default:
- BT_LOGE("Unknown detach return code %u", be32toh(rp.status));
+ BT_COMP_LOGE("Unknown detach return code %u", be32toh(rp.status));
goto error;
}
}
BT_HIDDEN
-ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
- FILE *fp)
+enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
+ struct lttng_live_trace *trace, FILE *fp, size_t *reply_len)
{
uint64_t len = 0;
- int ret;
+ enum lttng_live_get_one_metadata_status metadata_status;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_metadata rq;
struct lttng_viewer_metadata_packet rp;
char *data = NULL;
ssize_t ret_len;
struct lttng_live_session *session = trace->session;
- struct lttng_live_msg_iter *lttng_live_msg_iter = session->lttng_live_msg_iter;
+ 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;
+ lttng_live_msg_iter->viewer_connection;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending get_metadata request: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending get_metadata request: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving get_metadata response: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving get_metadata response: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == sizeof(rp));
switch (be32toh(rp.status)) {
case LTTNG_VIEWER_METADATA_OK:
- BT_LOGD("get_metadata : OK");
+ BT_COMP_LOGD("Received get_metadata response : OK");
break;
case LTTNG_VIEWER_NO_NEW_METADATA:
- BT_LOGD("get_metadata : NO NEW");
- ret = 0;
+ BT_COMP_LOGD("Received get_metadata response: no new");
+ metadata_status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_END;
goto end;
case LTTNG_VIEWER_METADATA_ERR:
- BT_LOGD("get_metadata : ERR");
- goto error;
+ /*
+ * The Relayd cannot find this stream id. Maybe its
+ * gone already. This can happen in short lived UST app
+ * in a per-pid session.
+ */
+ BT_COMP_LOGD("Received get_metadata response: error");
+ metadata_status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED;
+ goto end;
default:
- BT_LOGD("get_metadata : UNKNOWN");
+ BT_COMP_LOGD("get_metadata : UNKNOWN");
goto error;
}
len = be64toh(rp.len);
- BT_LOGD("Writing %" PRIu64" bytes to metadata", len);
+ BT_COMP_LOGD("Writing %" PRIu64" bytes to metadata", len);
if (len <= 0) {
goto error;
}
data = calloc(1, len);
if (!data) {
- BT_LOGE("relay data calloc: %s", strerror(errno));
+ BT_COMP_LOGE("relay data calloc: %s", strerror(errno));
goto error;
}
ret_len = lttng_live_recv(viewer_connection, data, len);
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error_free_data;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
goto error_free_data;
}
BT_ASSERT(ret_len == len);
ret_len = fwrite(data, 1, len, fp);
} while (ret_len < 0 && errno == EINTR);
if (ret_len < 0) {
- BT_LOGE("Writing in the metadata fp");
+ BT_COMP_LOGE("Writing in the metadata fp");
goto error_free_data;
}
BT_ASSERT(ret_len == len);
free(data);
- ret = len;
-end:
- return ret;
+ *reply_len = len;
+ metadata_status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK;
+
+ goto end;
error_free_data:
free(data);
error:
- return -1;
+ metadata_status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
+
+end:
+ return metadata_status;
}
/*
{
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_next_index rq;
- ssize_t ret_len;
struct lttng_viewer_index rp;
- uint32_t flags, status;
- enum lttng_live_iterator_status retstatus =
- LTTNG_LIVE_ITERATOR_STATUS_OK;
+ enum lttng_live_iterator_status retstatus = LTTNG_LIVE_ITERATOR_STATUS_OK;
struct live_viewer_connection *viewer_connection =
lttng_live_msg_iter->viewer_connection;
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_live_component *lttng_live =
- lttng_live_msg_iter->lttng_live_comp;
+ uint32_t flags, status;
+ ssize_t ret_len;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
cmd.data_size = htobe64((uint64_t) sizeof(rq));
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending get_next_index request: %s",
+ BT_COMP_LOGE("Error sending get_next_index request: %s",
bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving get_next_index response: %s",
+ BT_COMP_LOGE("Error receiving get_next_index response: %s",
bt_socket_errormsg());
goto error;
}
{
uint64_t ctf_stream_class_id;
- BT_LOGD("get_next_index: inactive");
+ BT_COMP_LOGD("get_next_index: inactive");
memset(index, 0, sizeof(struct packet_index));
index->ts_cycles.timestamp_end = be64toh(rp.timestamp_end);
stream->current_inactivity_ts = index->ts_cycles.timestamp_end;
{
uint64_t ctf_stream_class_id;
- BT_LOGD("get_next_index: OK");
+ BT_COMP_LOGD("get_next_index: OK");
lttng_index_to_packet_index(&rp, index);
ctf_stream_class_id = be64toh(rp.stream_id);
if (stream->ctf_stream_class_id != -1ULL) {
stream->state = LTTNG_LIVE_STREAM_ACTIVE_DATA;
if (flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
- BT_LOGD("get_next_index: new metadata needed");
+ BT_COMP_LOGD("get_next_index: new metadata needed");
trace->new_metadata_needed = true;
}
if (flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
- BT_LOGD("get_next_index: new streams needed");
+ BT_COMP_LOGD("get_next_index: new streams needed");
lttng_live_need_new_streams(lttng_live_msg_iter);
}
break;
}
case LTTNG_VIEWER_INDEX_RETRY:
- BT_LOGD("get_next_index: retry");
+ BT_COMP_LOGD("get_next_index: retry");
memset(index, 0, sizeof(struct packet_index));
retstatus = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA;
goto end;
case LTTNG_VIEWER_INDEX_HUP:
- BT_LOGD("get_next_index: stream hung up");
+ BT_COMP_LOGD("get_next_index: stream hung up");
memset(index, 0, sizeof(struct packet_index));
index->offset = EOF;
retstatus = LTTNG_LIVE_ITERATOR_STATUS_END;
stream->state = LTTNG_LIVE_STREAM_EOF;
+ stream->has_stream_hung_up = true;
break;
case LTTNG_VIEWER_INDEX_ERR:
- BT_LOGE("get_next_index: error");
+ BT_COMP_LOGE("get_next_index: error");
memset(index, 0, sizeof(struct packet_index));
stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA;
goto error;
default:
- BT_LOGE("get_next_index: unknown value");
+ BT_COMP_LOGE("get_next_index: unknown value");
memset(index, 0, sizeof(struct packet_index));
stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA;
goto error;
return retstatus;
error:
- if (lttng_live_graph_is_canceled(lttng_live)) {
+ if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
retstatus = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
} else {
retstatus = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
uint64_t offset, uint64_t req_len, uint64_t *recv_len)
{
enum bt_msg_iter_medium_status retstatus = BT_MSG_ITER_MEDIUM_STATUS_OK;
+ struct lttng_viewer_trace_packet rp;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_get_packet rq;
- struct lttng_viewer_trace_packet rp;
- ssize_t ret_len;
- uint32_t flags, status;
struct live_viewer_connection *viewer_connection =
lttng_live_msg_iter->viewer_connection;
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_live_component *lttng_live =
- lttng_live_msg_iter->lttng_live_comp;
+ uint32_t flags, status;
+ ssize_t ret_len;
- BT_LOGD("lttng_live_get_stream_bytes: offset=%" PRIu64 ", req_len=%" PRIu64,
+ BT_COMP_LOGD("lttng_live_get_stream_bytes: offset=%" PRIu64 ", req_len=%" PRIu64,
offset, req_len);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
cmd.data_size = htobe64((uint64_t) sizeof(rq));
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending get_data request: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error sending get_data request: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving get_data response: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving get_data response: %s", bt_socket_errormsg());
goto error;
}
if (ret_len != sizeof(rp)) {
- BT_LOGE("get_data_packet: expected %zu"
+ BT_COMP_LOGE("get_data_packet: expected %zu"
", received %zd", sizeof(rp),
ret_len);
goto error;
switch (status) {
case LTTNG_VIEWER_GET_PACKET_OK:
req_len = be32toh(rp.len);
- BT_LOGD("get_data_packet: Ok, packet size : %" PRIu64 "", req_len);
+ BT_COMP_LOGD("get_data_packet: Ok, packet size : %" PRIu64 "", req_len);
break;
case LTTNG_VIEWER_GET_PACKET_RETRY:
/* Unimplemented by relay daemon */
- BT_LOGD("get_data_packet: retry");
+ BT_COMP_LOGD("get_data_packet: retry");
retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
goto end;
case LTTNG_VIEWER_GET_PACKET_ERR:
if (flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
- BT_LOGD("get_data_packet: new metadata needed, try again later");
+ BT_COMP_LOGD("get_data_packet: new metadata needed, try again later");
trace->new_metadata_needed = true;
}
if (flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
- BT_LOGD("get_data_packet: new streams needed, try again later");
+ BT_COMP_LOGD("get_data_packet: new streams needed, try again later");
lttng_live_need_new_streams(lttng_live_msg_iter);
}
if (flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
goto end;
}
- BT_LOGE("get_data_packet: error");
+ BT_COMP_LOGE("get_data_packet: error");
goto error;
case LTTNG_VIEWER_GET_PACKET_EOF:
retstatus = BT_MSG_ITER_MEDIUM_STATUS_EOF;
goto end;
default:
- BT_LOGE("get_data_packet: unknown");
+ BT_COMP_LOGE("get_data_packet: unknown");
goto error;
}
ret_len = lttng_live_recv(viewer_connection, buf, req_len);
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
+ BT_COMP_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == req_len);
return retstatus;
error:
- if (lttng_live_graph_is_canceled(lttng_live)) {
+ if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
} else {
retstatus = BT_MSG_ITER_MEDIUM_STATUS_ERROR;
struct lttng_viewer_cmd cmd;
struct lttng_viewer_new_streams_request rq;
struct lttng_viewer_new_streams_response rp;
- ssize_t ret_len;
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;
- struct lttng_live_component *lttng_live =
- lttng_live_msg_iter->lttng_live_comp;
uint32_t streams_count;
const size_t cmd_buf_len = sizeof(cmd) + sizeof(rq);
char cmd_buf[cmd_buf_len];
+ ssize_t ret_len;
if (!session->new_streams_needed) {
return LTTNG_LIVE_ITERATOR_STATUS_OK;
memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error sending get_new_streams request: %s",
+ BT_COMP_LOGE("Error sending get_new_streams request: %s",
bt_socket_errormsg());
goto error;
}
BT_ASSERT(ret_len == cmd_buf_len);
ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
if (ret_len == 0) {
- BT_LOGI("Remote side has closed connection");
+ BT_COMP_LOGI("Remote side has closed connection");
goto error;
}
if (ret_len == BT_SOCKET_ERROR) {
- BT_LOGE("Error receiving get_new_streams response");
+ BT_COMP_LOGE("Error receiving get_new_streams response");
goto error;
}
BT_ASSERT(ret_len == sizeof(rp));
status = LTTNG_LIVE_ITERATOR_STATUS_END;
goto end;
case LTTNG_VIEWER_NEW_STREAMS_ERR:
- BT_LOGE("get_new_streams error");
+ BT_COMP_LOGE("get_new_streams error");
goto error;
default:
- BT_LOGE("Unknown return code %u", be32toh(rp.status));
+ BT_COMP_LOGE("Unknown return code %u", be32toh(rp.status));
goto error;
}
return status;
error:
- if (lttng_live_graph_is_canceled(lttng_live)) {
+ if (lttng_live_graph_is_canceled(lttng_live_msg_iter)) {
status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
} else {
status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
BT_HIDDEN
struct live_viewer_connection *live_viewer_connection_create(
const char *url, bool in_query,
- struct lttng_live_msg_iter *lttng_live_msg_iter)
+ struct lttng_live_msg_iter *lttng_live_msg_iter,
+ bt_logging_level log_level)
{
struct live_viewer_connection *viewer_connection;
viewer_connection = g_new0(struct live_viewer_connection, 1);
- if (bt_socket_init() != 0) {
+ if (bt_socket_init(log_level) != 0) {
goto error;
}
- viewer_connection->log_level = lttng_live_msg_iter->log_level;
+ viewer_connection->log_level = log_level;
+
+ if (lttng_live_msg_iter) {
+ viewer_connection->self_comp = lttng_live_msg_iter->self_comp;
+ }
+
bt_object_init_shared(&viewer_connection->obj, connection_release);
viewer_connection->control_sock = BT_INVALID_SOCKET;
viewer_connection->port = -1;
goto error;
}
- BT_LOGI("Establishing connection to url \"%s\"...", url);
+ BT_COMP_LOGI("Establishing connection to url \"%s\"...", url);
if (lttng_live_connect_viewer(viewer_connection)) {
goto error_report;
}
- BT_LOGI("Connection to url \"%s\" is established", url);
+ BT_COMP_LOGI("Connection to url \"%s\" is established", url);
return viewer_connection;
error_report:
- BT_LOGW("Failure to establish connection to url \"%s\"", url);
+ BT_COMP_LOGW("Failure to establish connection to url \"%s\"", url);
error:
- g_free(viewer_connection);
+ if (viewer_connection) {
+ live_viewer_connection_destroy(viewer_connection);
+ }
+
return NULL;
}
void live_viewer_connection_destroy(
struct live_viewer_connection *viewer_connection)
{
- BT_LOGI("Closing connection to url \"%s\"", viewer_connection->url->str);
+ BT_COMP_LOGI("Closing connection to url \"%s\"", viewer_connection->url->str);
lttng_live_disconnect_viewer(viewer_connection);
- g_string_free(viewer_connection->url, true);
+ if (viewer_connection->url) {
+ g_string_free(viewer_connection->url, true);
+ }
if (viewer_connection->relay_hostname) {
g_string_free(viewer_connection->relay_hostname, true);
}
projects / babeltrace.git / blobdiff