#include <common/uri.h>
#include <common/utils.h>
#include <common/config/session-config.h>
+#include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
#include <urcu/rculist.h>
+#include "version.h"
#include "cmd.h"
#include "ctf-trace.h"
#include "index.h"
#include "stream.h"
#include "connection.h"
#include "tracefile-array.h"
+#include "tcp_keep_alive.h"
+
+enum relay_connection_status {
+ RELAY_CONNECTION_STATUS_OK,
+ /* An error occured while processing an event on the connection. */
+ RELAY_CONNECTION_STATUS_ERROR,
+ /* Connection closed/shutdown cleanly. */
+ RELAY_CONNECTION_STATUS_CLOSED,
+};
/* command line options */
-char *opt_output_path;
-static int opt_daemon, opt_background;
+char *opt_output_path, *opt_working_directory;
+static int opt_daemon, opt_background, opt_print_version;
+int opt_group_output_by_session;
+int opt_group_output_by_host;
/*
* We need to wait for listener and live listener threads, as well as
*/
static struct relay_conn_queue relay_conn_queue;
-/* buffer allocated at startup, used to store the trace data */
-static char *data_buffer;
-static unsigned int data_buffer_size;
-
/* Global relay stream hash table. */
struct lttng_ht *relay_streams_ht;
{ "verbose", 0, 0, 'v', },
{ "config", 1, 0, 'f' },
{ "version", 0, 0, 'V' },
+ { "working-directory", 1, 0, 'w', },
+ { "group-output-by-session", 0, 0, 's', },
+ { "group-output-by-host", 0, 0, 'p', },
{ NULL, 0, 0, 0, },
};
static const char *config_ignore_options[] = { "help", "config", "version" };
+static void print_version(void) {
+ fprintf(stdout, "%s\n", VERSION);
+}
+
+static void relayd_config_log(void)
+{
+ DBG("LTTng-relayd " VERSION " - " VERSION_NAME "%s%s",
+ GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+ EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
+ if (EXTRA_VERSION_DESCRIPTION[0] != '\0') {
+ DBG("LTTng-relayd extra version description:\n\t" EXTRA_VERSION_DESCRIPTION "\n");
+ }
+}
+
/*
* Take an option from the getopt output and set it in the right variable to be
* used later.
}
exit(EXIT_FAILURE);
case 'V':
- fprintf(stdout, "%s\n", VERSION);
- exit(EXIT_SUCCESS);
+ opt_print_version = 1;
+ break;
case 'o':
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
}
}
break;
+ case 'w':
+ if (lttng_is_setuid_setgid()) {
+ WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+ "-w, --working-directory");
+ } else {
+ ret = asprintf(&opt_working_directory, "%s", arg);
+ if (ret < 0) {
+ ret = -errno;
+ PERROR("asprintf working_directory");
+ goto end;
+ }
+ }
+ break;
+
case 'v':
/* Verbose level can increase using multiple -v */
if (arg) {
}
}
break;
+ case 's':
+ if (opt_group_output_by_host) {
+ ERR("Cannot set --group-output-by-session, --group-output-by-host already defined");
+ exit(EXIT_FAILURE);
+ }
+ opt_group_output_by_session = 1;
+ break;
+ case 'p':
+ if (opt_group_output_by_session) {
+ ERR("Cannot set --group-output-by-host, --group-output-by-session already defined");
+ exit(EXIT_FAILURE);
+ }
+ opt_group_output_by_host = 1;
+ break;
default:
/* Unknown option or other error.
* Error is printed by getopt, just return */
return ret;
}
+static void parse_env_options(void)
+{
+ char *value = NULL;
+
+ value = lttng_secure_getenv(DEFAULT_LTTNG_RELAYD_WORKING_DIRECTORY_ENV);
+ if (value) {
+ opt_working_directory = value;
+ }
+}
+
static int set_options(int argc, char **argv)
{
int c, ret = 0, option_index = 0, retval = 0;
}
}
+ if (!opt_group_output_by_session && !opt_group_output_by_host) {
+ /* Group by host by default */
+ opt_group_output_by_host = 1;
+ }
+
exit:
free(optstring);
return retval;
lttcomm_destroy_sock(newsock);
goto error;
}
+
+ ret = socket_apply_keep_alive_config(newsock->fd);
+ if (ret < 0) {
+ ERR("Failed to apply TCP keep-alive configuration on socket (%i)",
+ newsock->fd);
+ lttcomm_destroy_sock(newsock);
+ goto error;
+ }
+
new_conn = connection_create(newsock, type);
if (!new_conn) {
lttcomm_destroy_sock(newsock);
health_code_update();
- while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
+ for (;;) {
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&relay_conn_queue.futex);
+ if (CMM_LOAD_SHARED(dispatch_thread_exit)) {
+ break;
+ }
+
do {
health_code_update();
struct ctf_packet_index index_data;
/*
- * The index on disk is encoded in big endian, so we don't need
- * to convert the data received on the network. The data_offset
- * value is NEVER modified here and is updated by the data
- * thread.
+ * The index on disk is encoded in big endian.
*/
- index_data.packet_size = data->packet_size;
- index_data.content_size = data->content_size;
- index_data.timestamp_begin = data->timestamp_begin;
- index_data.timestamp_end = data->timestamp_end;
- index_data.events_discarded = data->events_discarded;
- index_data.stream_id = data->stream_id;
+ index_data.packet_size = htobe64(data->packet_size);
+ index_data.content_size = htobe64(data->content_size);
+ index_data.timestamp_begin = htobe64(data->timestamp_begin);
+ index_data.timestamp_end = htobe64(data->timestamp_end);
+ index_data.events_discarded = htobe64(data->events_discarded);
+ index_data.stream_id = htobe64(data->stream_id);
if (conn->minor >= 8) {
- index->index_data.stream_instance_id = data->stream_instance_id;
- index->index_data.packet_seq_num = data->packet_seq_num;
+ index->index_data.stream_instance_id = htobe64(data->stream_instance_id);
+ index->index_data.packet_seq_num = htobe64(data->packet_seq_num);
}
return relay_index_set_data(index, &index_data);
*
* On success, send back the session id or else return a negative value.
*/
-static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_create_session(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret = 0, send_ret;
+ int ret = 0;
+ ssize_t send_ret;
struct relay_session *session;
struct lttcomm_relayd_status_session reply;
char session_name[LTTNG_NAME_MAX];
break;
case 4: /* LTTng sessiond 2.4 */
default:
- ret = cmd_create_session_2_4(conn, session_name,
+ ret = cmd_create_session_2_4(payload, session_name,
hostname, &live_timer, &snapshot);
}
if (ret < 0) {
}
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (send_ret < 0) {
- ERR("Relayd sending session id");
- ret = send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"create session\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
return ret;
/*
* relay_add_stream: allocate a new stream for a session
*/
-static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret;
ssize_t send_ret;
char *path_name = NULL, *channel_name = NULL;
uint64_t tracefile_size = 0, tracefile_count = 0;
- if (!session || conn->version_check_done == 0) {
+ if (!session || !conn->version_check_done) {
ERR("Trying to add a stream before version check");
ret = -1;
goto end_no_session;
switch (session->minor) {
case 1: /* LTTng sessiond 2.1. Allocates path_name and channel_name. */
- ret = cmd_recv_stream_2_1(conn, &path_name,
- &channel_name);
+ ret = cmd_recv_stream_2_1(payload, &path_name,
+ &channel_name, session);
break;
case 2: /* LTTng sessiond 2.2. Allocates path_name and channel_name. */
default:
- ret = cmd_recv_stream_2_2(conn, &path_name,
- &channel_name, &tracefile_size, &tracefile_count);
+ ret = cmd_recv_stream_2_2(payload, &path_name,
+ &channel_name, &tracefile_size, &tracefile_count,
+ session);
break;
}
if (ret < 0) {
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply,
sizeof(struct lttcomm_relayd_status_stream), 0);
- if (send_ret < 0) {
- ERR("Relay sending stream id");
- ret = (int) send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"add stream\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
end_no_session:
/*
* relay_close_stream: close a specific stream
*/
-static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_close_stream(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret, send_ret;
+ int ret;
+ ssize_t send_ret;
struct relay_session *session = conn->session;
struct lttcomm_relayd_close_stream stream_info;
struct lttcomm_relayd_generic_reply reply;
DBG("Close stream received");
- if (!session || conn->version_check_done == 0) {
+ if (!session || !conn->version_check_done) {
ERR("Trying to close a stream before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &stream_info,
- sizeof(struct lttcomm_relayd_close_stream), 0);
- if (ret < sizeof(struct lttcomm_relayd_close_stream)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid add_stream struct size : %d", ret);
- }
+ if (payload->size < sizeof(stream_info)) {
+ ERR("Unexpected payload size in \"relay_close_stream\": expected >= %zu bytes, got %zu bytes",
+ sizeof(stream_info), payload->size);
ret = -1;
goto end_no_session;
}
+ memcpy(&stream_info, payload->data, sizeof(stream_info));
+ stream_info.stream_id = be64toh(stream_info.stream_id);
+ stream_info.last_net_seq_num = be64toh(stream_info.last_net_seq_num);
- stream = stream_get_by_id(be64toh(stream_info.stream_id));
+ stream = stream_get_by_id(stream_info.stream_id);
if (!stream) {
ret = -1;
goto end;
* pending check.
*/
pthread_mutex_lock(&stream->lock);
- stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num);
+ stream->last_net_seq_num = stream_info.last_net_seq_num;
pthread_mutex_unlock(&stream->lock);
/*
}
}
stream_put(stream);
+ ret = 0;
end:
memset(&reply, 0, sizeof(reply));
}
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply,
sizeof(struct lttcomm_relayd_generic_reply), 0);
- if (send_ret < 0) {
- ERR("Relay sending stream id");
- ret = send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"close stream\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
end_no_session:
* relay_reset_metadata: reset a metadata stream
*/
static
-int relay_reset_metadata(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+int relay_reset_metadata(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret, send_ret;
+ int ret;
+ ssize_t send_ret;
struct relay_session *session = conn->session;
struct lttcomm_relayd_reset_metadata stream_info;
struct lttcomm_relayd_generic_reply reply;
DBG("Reset metadata received");
- if (!session || conn->version_check_done == 0) {
+ if (!session || !conn->version_check_done) {
ERR("Trying to reset a metadata stream before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &stream_info,
- sizeof(struct lttcomm_relayd_reset_metadata), 0);
- if (ret < sizeof(struct lttcomm_relayd_reset_metadata)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid reset_metadata struct "
- "size : %d", ret);
- }
+ if (payload->size < sizeof(stream_info)) {
+ ERR("Unexpected payload size in \"relay_reset_metadata\": expected >= %zu bytes, got %zu bytes",
+ sizeof(stream_info), payload->size);
ret = -1;
goto end_no_session;
}
- DBG("Update metadata to version %" PRIu64, be64toh(stream_info.version));
+ memcpy(&stream_info, payload->data, sizeof(stream_info));
+ stream_info.stream_id = be64toh(stream_info.stream_id);
+ stream_info.version = be64toh(stream_info.version);
+
+ DBG("Update metadata to version %" PRIu64, stream_info.version);
/* Unsupported for live sessions for now. */
if (session->live_timer != 0) {
goto end;
}
- stream = stream_get_by_id(be64toh(stream_info.stream_id));
+ stream = stream_get_by_id(stream_info.stream_id);
if (!stream) {
ret = -1;
goto end;
}
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply,
sizeof(struct lttcomm_relayd_generic_reply), 0);
- if (send_ret < 0) {
- ERR("Relay sending reset metadata reply");
- ret = send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"reset metadata\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
end_no_session:
static void relay_unknown_command(struct relay_connection *conn)
{
struct lttcomm_relayd_generic_reply reply;
- int ret;
+ ssize_t send_ret;
memset(&reply, 0, sizeof(reply));
reply.ret_code = htobe32(LTTNG_ERR_UNK);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply,
- sizeof(struct lttcomm_relayd_generic_reply), 0);
- if (ret < 0) {
- ERR("Relay sending unknown command");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
+ if (send_ret < sizeof(reply)) {
+ ERR("Failed to send \"unknown command\" command reply (ret = %zd)", send_ret);
}
}
* relay_start: send an acknowledgment to the client to tell if we are
* ready to receive data. We are ready if a session is established.
*/
-static int relay_start(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_start(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret = htobe32(LTTNG_OK);
+ int ret = 0;
+ ssize_t send_ret;
struct lttcomm_relayd_generic_reply reply;
struct relay_session *session = conn->session;
}
memset(&reply, 0, sizeof(reply));
- reply.ret_code = ret;
- ret = conn->sock->ops->sendmsg(conn->sock, &reply,
- sizeof(struct lttcomm_relayd_generic_reply), 0);
- if (ret < 0) {
- ERR("Relay sending start ack");
+ reply.ret_code = htobe32(LTTNG_OK);
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply,
+ sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"relay_start\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
return ret;
/*
* relay_recv_metadata: receive the metadata for the session.
*/
-static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_recv_metadata(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret = 0;
ssize_t size_ret;
struct relay_session *session = conn->session;
- struct lttcomm_relayd_metadata_payload *metadata_struct;
+ struct lttcomm_relayd_metadata_payload metadata_payload_header;
struct relay_stream *metadata_stream;
- uint64_t data_size, payload_size;
+ uint64_t metadata_payload_size;
if (!session) {
ERR("Metadata sent before version check");
goto end;
}
- data_size = payload_size = be64toh(recv_hdr->data_size);
- if (data_size < sizeof(struct lttcomm_relayd_metadata_payload)) {
+ if (recv_hdr->data_size < sizeof(struct lttcomm_relayd_metadata_payload)) {
ERR("Incorrect data size");
ret = -1;
goto end;
}
- payload_size -= sizeof(struct lttcomm_relayd_metadata_payload);
-
- if (data_buffer_size < data_size) {
- /* In case the realloc fails, we can free the memory */
- char *tmp_data_ptr;
+ metadata_payload_size = recv_hdr->data_size -
+ sizeof(struct lttcomm_relayd_metadata_payload);
- tmp_data_ptr = realloc(data_buffer, data_size);
- if (!tmp_data_ptr) {
- ERR("Allocating data buffer");
- free(data_buffer);
- ret = -1;
- goto end;
- }
- data_buffer = tmp_data_ptr;
- data_buffer_size = data_size;
- }
- memset(data_buffer, 0, data_size);
- DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size);
- size_ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0);
- if (size_ret < 0 || size_ret != data_size) {
- if (size_ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive the whole metadata");
- }
- ret = -1;
- goto end;
- }
- metadata_struct = (struct lttcomm_relayd_metadata_payload *) data_buffer;
+ memcpy(&metadata_payload_header, payload->data,
+ sizeof(metadata_payload_header));
+ metadata_payload_header.stream_id = be64toh(
+ metadata_payload_header.stream_id);
+ metadata_payload_header.padding_size = be32toh(
+ metadata_payload_header.padding_size);
- metadata_stream = stream_get_by_id(be64toh(metadata_struct->stream_id));
+ metadata_stream = stream_get_by_id(metadata_payload_header.stream_id);
if (!metadata_stream) {
ret = -1;
goto end;
pthread_mutex_lock(&metadata_stream->lock);
- size_ret = lttng_write(metadata_stream->stream_fd->fd, metadata_struct->payload,
- payload_size);
- if (size_ret < payload_size) {
+ size_ret = lttng_write(metadata_stream->stream_fd->fd,
+ payload->data + sizeof(metadata_payload_header),
+ metadata_payload_size);
+ if (size_ret < metadata_payload_size) {
ERR("Relay error writing metadata on file");
ret = -1;
goto end_put;
}
size_ret = write_padding_to_file(metadata_stream->stream_fd->fd,
- be32toh(metadata_struct->padding_size));
- if (size_ret < 0) {
+ metadata_payload_header.padding_size);
+ if (size_ret < (int64_t) metadata_payload_header.padding_size) {
+ ret = -1;
goto end_put;
}
metadata_stream->metadata_received +=
- payload_size + be32toh(metadata_struct->padding_size);
+ metadata_payload_size + metadata_payload_header.padding_size;
DBG2("Relay metadata written. Updated metadata_received %" PRIu64,
metadata_stream->metadata_received);
/*
* relay_send_version: send relayd version number
*/
-static int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_send_version(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret;
+ ssize_t send_ret;
struct lttcomm_relayd_version reply, msg;
+ bool compatible = true;
- conn->version_check_done = 1;
+ conn->version_check_done = true;
/* Get version from the other side. */
- ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0);
- if (ret < 0 || ret != sizeof(msg)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay failed to receive the version values.");
- }
+ if (payload->size < sizeof(msg)) {
+ ERR("Unexpected payload size in \"relay_send_version\": expected >= %zu bytes, got %zu bytes",
+ sizeof(msg), payload->size);
ret = -1;
goto end;
}
+ memcpy(&msg, payload->data, sizeof(msg));
+ msg.major = be32toh(msg.major);
+ msg.minor = be32toh(msg.minor);
+
memset(&reply, 0, sizeof(reply));
reply.major = RELAYD_VERSION_COMM_MAJOR;
reply.minor = RELAYD_VERSION_COMM_MINOR;
/* Major versions must be the same */
- if (reply.major != be32toh(msg.major)) {
+ if (reply.major != msg.major) {
DBG("Incompatible major versions (%u vs %u), deleting session",
- reply.major, be32toh(msg.major));
- connection_put(conn);
- ret = 0;
- goto end;
+ reply.major, msg.major);
+ compatible = false;
}
conn->major = reply.major;
/* We adapt to the lowest compatible version */
- if (reply.minor <= be32toh(msg.minor)) {
+ if (reply.minor <= msg.minor) {
conn->minor = reply.minor;
} else {
- conn->minor = be32toh(msg.minor);
+ conn->minor = msg.minor;
}
reply.major = htobe32(reply.major);
reply.minor = htobe32(reply.minor);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply,
- sizeof(struct lttcomm_relayd_version), 0);
- if (ret < 0) {
- ERR("Relay sending version");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply,
+ sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"send version\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
+ goto end;
+ } else {
+ ret = 0;
+ }
+
+ if (!compatible) {
+ ret = -1;
+ goto end;
}
DBG("Version check done using protocol %u.%u", conn->major,
/*
* Check for data pending for a given stream id from the session daemon.
*/
-static int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
struct relay_session *session = conn->session;
struct lttcomm_relayd_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
+ ssize_t send_ret;
int ret;
- uint64_t last_net_seq_num, stream_id;
DBG("Data pending command received");
- if (!session || conn->version_check_done == 0) {
+ if (!session || !conn->version_check_done) {
ERR("Trying to check for data before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0);
- if (ret < sizeof(msg)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid data_pending struct size : %d",
- ret);
- }
+ if (payload->size < sizeof(msg)) {
+ ERR("Unexpected payload size in \"relay_data_pending\": expected >= %zu bytes, got %zu bytes",
+ sizeof(msg), payload->size);
ret = -1;
goto end_no_session;
}
+ memcpy(&msg, payload->data, sizeof(msg));
+ msg.stream_id = be64toh(msg.stream_id);
+ msg.last_net_seq_num = be64toh(msg.last_net_seq_num);
- stream_id = be64toh(msg.stream_id);
- last_net_seq_num = be64toh(msg.last_net_seq_num);
-
- stream = stream_get_by_id(stream_id);
+ stream = stream_get_by_id(msg.stream_id);
if (stream == NULL) {
ret = -1;
goto end;
pthread_mutex_lock(&stream->lock);
DBG("Data pending for stream id %" PRIu64 " prev_seq %" PRIu64
- " and last_seq %" PRIu64, stream_id, stream->prev_seq,
- last_net_seq_num);
+ " and last_seq %" PRIu64, msg.stream_id,
+ stream->prev_seq, msg.last_net_seq_num);
/* Avoid wrapping issue */
- if (((int64_t) (stream->prev_seq - last_net_seq_num)) >= 0) {
+ if (((int64_t) (stream->prev_seq - msg.last_net_seq_num)) >= 0) {
/* Data has in fact been written and is NOT pending */
ret = 0;
} else {
memset(&reply, 0, sizeof(reply));
reply.ret_code = htobe32(ret);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (ret < 0) {
- ERR("Relay data pending ret code failed");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"data pending\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
}
end_no_session:
* the control socket has been handled. So, this is why we simply return
* OK here.
*/
-static int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_quiescent_control(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret;
- uint64_t stream_id;
+ ssize_t send_ret;
struct relay_stream *stream;
struct lttcomm_relayd_quiescent_control msg;
struct lttcomm_relayd_generic_reply reply;
DBG("Checking quiescent state on control socket");
- if (!conn->session || conn->version_check_done == 0) {
+ if (!conn->session || !conn->version_check_done) {
ERR("Trying to check for data before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0);
- if (ret < sizeof(msg)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid begin data_pending struct size: %d",
- ret);
- }
+ if (payload->size < sizeof(msg)) {
+ ERR("Unexpected payload size in \"relay_quiescent_control\": expected >= %zu bytes, got %zu bytes",
+ sizeof(msg), payload->size);
ret = -1;
goto end_no_session;
}
+ memcpy(&msg, payload->data, sizeof(msg));
+ msg.stream_id = be64toh(msg.stream_id);
- stream_id = be64toh(msg.stream_id);
- stream = stream_get_by_id(stream_id);
+ stream = stream_get_by_id(msg.stream_id);
if (!stream) {
goto reply;
}
pthread_mutex_lock(&stream->lock);
stream->data_pending_check_done = true;
pthread_mutex_unlock(&stream->lock);
- DBG("Relay quiescent control pending flag set to %" PRIu64, stream_id);
+
+ DBG("Relay quiescent control pending flag set to %" PRIu64, msg.stream_id);
stream_put(stream);
reply:
memset(&reply, 0, sizeof(reply));
reply.ret_code = htobe32(LTTNG_OK);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (ret < 0) {
- ERR("Relay data quiescent control ret code failed");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"quiescent control\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
+ } else {
+ ret = 0;
}
end_no_session:
*
* This command returns to the client a LTTNG_OK code.
*/
-static int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_begin_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret;
+ ssize_t send_ret;
struct lttng_ht_iter iter;
struct lttcomm_relayd_begin_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
- uint64_t session_id;
assert(recv_hdr);
assert(conn);
DBG("Init streams for data pending");
- if (!conn->session || conn->version_check_done == 0) {
+ if (!conn->session || !conn->version_check_done) {
ERR("Trying to check for data before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0);
- if (ret < sizeof(msg)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid begin data_pending struct size: %d",
- ret);
- }
+ if (payload->size < sizeof(msg)) {
+ ERR("Unexpected payload size in \"relay_begin_data_pending\": expected >= %zu bytes, got %zu bytes",
+ sizeof(msg), payload->size);
ret = -1;
goto end_no_session;
}
-
- session_id = be64toh(msg.session_id);
+ memcpy(&msg, payload->data, sizeof(msg));
+ msg.session_id = be64toh(msg.session_id);
/*
* Iterate over all streams to set the begin data pending flag.
if (!stream_get(stream)) {
continue;
}
- if (stream->trace->session->id == session_id) {
+ if (stream->trace->session->id == msg.session_id) {
pthread_mutex_lock(&stream->lock);
stream->data_pending_check_done = false;
pthread_mutex_unlock(&stream->lock);
/* All good, send back reply. */
reply.ret_code = htobe32(LTTNG_OK);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (ret < 0) {
- ERR("Relay begin data pending send reply failed");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"begin data pending\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
+ } else {
+ ret = 0;
}
end_no_session:
*
* Return to the client if there is data in flight or not with a ret_code.
*/
-static int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_end_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
int ret;
+ ssize_t send_ret;
struct lttng_ht_iter iter;
struct lttcomm_relayd_end_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
- uint64_t session_id;
uint32_t is_data_inflight = 0;
DBG("End data pending command");
- if (!conn->session || conn->version_check_done == 0) {
+ if (!conn->session || !conn->version_check_done) {
ERR("Trying to check for data before version check");
ret = -1;
goto end_no_session;
}
- ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0);
- if (ret < sizeof(msg)) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid end data_pending struct size: %d",
- ret);
- }
+ if (payload->size < sizeof(msg)) {
+ ERR("Unexpected payload size in \"relay_end_data_pending\": expected >= %zu bytes, got %zu bytes",
+ sizeof(msg), payload->size);
ret = -1;
goto end_no_session;
}
-
- session_id = be64toh(msg.session_id);
+ memcpy(&msg, payload->data, sizeof(msg));
+ msg.session_id = be64toh(msg.session_id);
/*
* Iterate over all streams to see if the begin data pending
if (!stream_get(stream)) {
continue;
}
- if (stream->trace->session->id != session_id) {
+ if (stream->trace->session->id != msg.session_id) {
stream_put(stream);
continue;
}
/* All good, send back reply. */
reply.ret_code = htobe32(is_data_inflight);
- ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (ret < 0) {
- ERR("Relay end data pending send reply failed");
+ send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"end data pending\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
+ } else {
+ ret = 0;
}
end_no_session:
*
* Return 0 on success else a negative value.
*/
-static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_recv_index(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret, send_ret;
+ int ret;
+ ssize_t send_ret;
struct relay_session *session = conn->session;
struct lttcomm_relayd_index index_info;
struct relay_index *index;
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
- uint64_t net_seq_num;
size_t msg_len;
assert(conn);
DBG("Relay receiving index");
- if (!session || conn->version_check_done == 0) {
+ if (!session || !conn->version_check_done) {
ERR("Trying to close a stream before version check");
ret = -1;
goto end_no_session;
msg_len = lttcomm_relayd_index_len(
lttng_to_index_major(conn->major, conn->minor),
lttng_to_index_minor(conn->major, conn->minor));
- ret = conn->sock->ops->recvmsg(conn->sock, &index_info,
- msg_len, 0);
- if (ret < msg_len) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Relay didn't receive valid index struct size : %d", ret);
- }
+ if (payload->size < msg_len) {
+ ERR("Unexpected payload size in \"relay_recv_index\": expected >= %zu bytes, got %zu bytes",
+ msg_len, payload->size);
ret = -1;
goto end_no_session;
}
+ memcpy(&index_info, payload->data, msg_len);
+ index_info.relay_stream_id = be64toh(index_info.relay_stream_id);
+ index_info.net_seq_num = be64toh(index_info.net_seq_num);
+ index_info.packet_size = be64toh(index_info.packet_size);
+ index_info.content_size = be64toh(index_info.content_size);
+ index_info.timestamp_begin = be64toh(index_info.timestamp_begin);
+ index_info.timestamp_end = be64toh(index_info.timestamp_end);
+ index_info.events_discarded = be64toh(index_info.events_discarded);
+ index_info.stream_id = be64toh(index_info.stream_id);
- net_seq_num = be64toh(index_info.net_seq_num);
+ if (conn->minor >= 8) {
+ index_info.stream_instance_id =
+ be64toh(index_info.stream_instance_id);
+ index_info.packet_seq_num = be64toh(index_info.packet_seq_num);
+ }
- stream = stream_get_by_id(be64toh(index_info.relay_stream_id));
+ stream = stream_get_by_id(index_info.relay_stream_id);
if (!stream) {
ERR("stream_get_by_id not found");
ret = -1;
*/
if (stream->index_received_seqcount > 0
&& stream->indexes_in_flight == 0) {
- stream->beacon_ts_end =
- be64toh(index_info.timestamp_end);
+ stream->beacon_ts_end = index_info.timestamp_end;
}
ret = 0;
goto end_stream_put;
}
if (stream->ctf_stream_id == -1ULL) {
- stream->ctf_stream_id = be64toh(index_info.stream_id);
+ stream->ctf_stream_id = index_info.stream_id;
}
- index = relay_index_get_by_id_or_create(stream, net_seq_num);
+ index = relay_index_get_by_id_or_create(stream, index_info.net_seq_num);
if (!index) {
ret = -1;
ERR("relay_index_get_by_id_or_create index NULL");
reply.ret_code = htobe32(LTTNG_OK);
}
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (send_ret < 0) {
- ERR("Relay sending close index id reply");
- ret = send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"recv index\" command reply (ret = %zd)", send_ret);
+ ret = -1;
}
end_no_session:
*
* Return 0 on success else a negative value.
*/
-static int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+static int relay_streams_sent(const struct lttcomm_relayd_hdr *recv_hdr,
+ struct relay_connection *conn,
+ const struct lttng_buffer_view *payload)
{
- int ret, send_ret;
+ int ret;
+ ssize_t send_ret;
struct lttcomm_relayd_generic_reply reply;
assert(conn);
DBG("Relay receiving streams_sent");
- if (!conn->session || conn->version_check_done == 0) {
+ if (!conn->session || !conn->version_check_done) {
ERR("Trying to close a stream before version check");
ret = -1;
goto end_no_session;
memset(&reply, 0, sizeof(reply));
reply.ret_code = htobe32(LTTNG_OK);
send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0);
- if (send_ret < 0) {
- ERR("Relay sending sent_stream reply");
- ret = send_ret;
+ if (send_ret < (ssize_t) sizeof(reply)) {
+ ERR("Failed to send \"streams sent\" command reply (ret = %zd)",
+ send_ret);
+ ret = -1;
} else {
/* Success. */
ret = 0;
return ret;
}
-/*
- * Process the commands received on the control socket
- */
-static int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr,
- struct relay_connection *conn)
+#define DBG_CMD(cmd_name, conn) \
+ DBG3("Processing \"%s\" command for socket %i", cmd_name, conn->sock->fd);
+
+static int relay_process_control_command(struct relay_connection *conn,
+ const struct lttcomm_relayd_hdr *header,
+ const struct lttng_buffer_view *payload)
{
int ret = 0;
- switch (be32toh(recv_hdr->cmd)) {
+ switch (header->cmd) {
case RELAYD_CREATE_SESSION:
- ret = relay_create_session(recv_hdr, conn);
+ DBG_CMD("RELAYD_CREATE_SESSION", conn);
+ ret = relay_create_session(header, conn, payload);
break;
case RELAYD_ADD_STREAM:
- ret = relay_add_stream(recv_hdr, conn);
+ DBG_CMD("RELAYD_ADD_STREAM", conn);
+ ret = relay_add_stream(header, conn, payload);
break;
case RELAYD_START_DATA:
- ret = relay_start(recv_hdr, conn);
+ DBG_CMD("RELAYD_START_DATA", conn);
+ ret = relay_start(header, conn, payload);
break;
case RELAYD_SEND_METADATA:
- ret = relay_recv_metadata(recv_hdr, conn);
+ DBG_CMD("RELAYD_SEND_METADATA", conn);
+ ret = relay_recv_metadata(header, conn, payload);
break;
case RELAYD_VERSION:
- ret = relay_send_version(recv_hdr, conn);
+ DBG_CMD("RELAYD_VERSION", conn);
+ ret = relay_send_version(header, conn, payload);
break;
case RELAYD_CLOSE_STREAM:
- ret = relay_close_stream(recv_hdr, conn);
+ DBG_CMD("RELAYD_CLOSE_STREAM", conn);
+ ret = relay_close_stream(header, conn, payload);
break;
case RELAYD_DATA_PENDING:
- ret = relay_data_pending(recv_hdr, conn);
+ DBG_CMD("RELAYD_DATA_PENDING", conn);
+ ret = relay_data_pending(header, conn, payload);
break;
case RELAYD_QUIESCENT_CONTROL:
- ret = relay_quiescent_control(recv_hdr, conn);
+ DBG_CMD("RELAYD_QUIESCENT_CONTROL", conn);
+ ret = relay_quiescent_control(header, conn, payload);
break;
case RELAYD_BEGIN_DATA_PENDING:
- ret = relay_begin_data_pending(recv_hdr, conn);
+ DBG_CMD("RELAYD_BEGIN_DATA_PENDING", conn);
+ ret = relay_begin_data_pending(header, conn, payload);
break;
case RELAYD_END_DATA_PENDING:
- ret = relay_end_data_pending(recv_hdr, conn);
+ DBG_CMD("RELAYD_END_DATA_PENDING", conn);
+ ret = relay_end_data_pending(header, conn, payload);
break;
case RELAYD_SEND_INDEX:
- ret = relay_recv_index(recv_hdr, conn);
+ DBG_CMD("RELAYD_SEND_INDEX", conn);
+ ret = relay_recv_index(header, conn, payload);
break;
case RELAYD_STREAMS_SENT:
- ret = relay_streams_sent(recv_hdr, conn);
+ DBG_CMD("RELAYD_STREAMS_SENT", conn);
+ ret = relay_streams_sent(header, conn, payload);
break;
case RELAYD_RESET_METADATA:
- ret = relay_reset_metadata(recv_hdr, conn);
+ DBG_CMD("RELAYD_RESET_METADATA", conn);
+ ret = relay_reset_metadata(header, conn, payload);
break;
case RELAYD_UPDATE_SYNC_INFO:
default:
- ERR("Received unknown command (%u)", be32toh(recv_hdr->cmd));
+ ERR("Received unknown command (%u)", header->cmd);
relay_unknown_command(conn);
ret = -1;
goto end;
return ret;
}
+static enum relay_connection_status relay_process_control_receive_payload(
+ struct relay_connection *conn)
+{
+ int ret = 0;
+ enum relay_connection_status status = RELAY_CONNECTION_STATUS_OK;
+ struct lttng_dynamic_buffer *reception_buffer =
+ &conn->protocol.ctrl.reception_buffer;
+ struct ctrl_connection_state_receive_payload *state =
+ &conn->protocol.ctrl.state.receive_payload;
+ struct lttng_buffer_view payload_view;
+
+ if (state->left_to_receive == 0) {
+ /* Short-circuit for payload-less commands. */
+ goto reception_complete;
+ }
+ ret = conn->sock->ops->recvmsg(conn->sock,
+ reception_buffer->data + state->received,
+ state->left_to_receive, MSG_DONTWAIT);
+ if (ret < 0) {
+ if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ PERROR("Unable to receive command payload on sock %d",
+ conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ }
+ goto end;
+ } else if (ret == 0) {
+ DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_CLOSED;
+ goto end;
+ }
+
+ assert(ret > 0);
+ assert(ret <= state->left_to_receive);
+
+ state->left_to_receive -= ret;
+ state->received += ret;
+
+ if (state->left_to_receive > 0) {
+ /*
+ * Can't transition to the protocol's next state, wait to
+ * receive the rest of the header.
+ */
+ DBG3("Partial reception of control connection protocol payload (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)",
+ state->received, state->left_to_receive,
+ conn->sock->fd);
+ goto end;
+ }
+
+reception_complete:
+ DBG("Done receiving control command payload: fd = %i, payload size = %" PRIu64 " bytes",
+ conn->sock->fd, state->received);
+ /*
+ * The payload required to process the command has been received.
+ * A view to the reception buffer is forwarded to the various
+ * commands and the state of the control is reset on success.
+ *
+ * Commands are responsible for sending their reply to the peer.
+ */
+ payload_view = lttng_buffer_view_from_dynamic_buffer(reception_buffer,
+ 0, -1);
+ ret = relay_process_control_command(conn,
+ &state->header, &payload_view);
+ if (ret < 0) {
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end;
+ }
+
+ ret = connection_reset_protocol_state(conn);
+ if (ret) {
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ }
+end:
+ return status;
+}
+
+static enum relay_connection_status relay_process_control_receive_header(
+ struct relay_connection *conn)
+{
+ int ret = 0;
+ enum relay_connection_status status = RELAY_CONNECTION_STATUS_OK;
+ struct lttcomm_relayd_hdr header;
+ struct lttng_dynamic_buffer *reception_buffer =
+ &conn->protocol.ctrl.reception_buffer;
+ struct ctrl_connection_state_receive_header *state =
+ &conn->protocol.ctrl.state.receive_header;
+
+ assert(state->left_to_receive != 0);
+
+ ret = conn->sock->ops->recvmsg(conn->sock,
+ reception_buffer->data + state->received,
+ state->left_to_receive, MSG_DONTWAIT);
+ if (ret < 0) {
+ if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ PERROR("Unable to receive control command header on sock %d",
+ conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ }
+ goto end;
+ } else if (ret == 0) {
+ DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_CLOSED;
+ goto end;
+ }
+
+ assert(ret > 0);
+ assert(ret <= state->left_to_receive);
+
+ state->left_to_receive -= ret;
+ state->received += ret;
+
+ if (state->left_to_receive > 0) {
+ /*
+ * Can't transition to the protocol's next state, wait to
+ * receive the rest of the header.
+ */
+ DBG3("Partial reception of control connection protocol header (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)",
+ state->received, state->left_to_receive,
+ conn->sock->fd);
+ goto end;
+ }
+
+ /* Transition to next state: receiving the command's payload. */
+ conn->protocol.ctrl.state_id =
+ CTRL_CONNECTION_STATE_RECEIVE_PAYLOAD;
+ memcpy(&header, reception_buffer->data, sizeof(header));
+ header.circuit_id = be64toh(header.circuit_id);
+ header.data_size = be64toh(header.data_size);
+ header.cmd = be32toh(header.cmd);
+ header.cmd_version = be32toh(header.cmd_version);
+ memcpy(&conn->protocol.ctrl.state.receive_payload.header,
+ &header, sizeof(header));
+
+ DBG("Done receiving control command header: fd = %i, cmd = %" PRIu32 ", cmd_version = %" PRIu32 ", payload size = %" PRIu64 " bytes",
+ conn->sock->fd, header.cmd, header.cmd_version,
+ header.data_size);
+
+ if (header.data_size > DEFAULT_NETWORK_RELAYD_CTRL_MAX_PAYLOAD_SIZE) {
+ ERR("Command header indicates a payload (%" PRIu64 " bytes) that exceeds the maximal payload size allowed on a control connection.",
+ header.data_size);
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end;
+ }
+
+ conn->protocol.ctrl.state.receive_payload.left_to_receive =
+ header.data_size;
+ conn->protocol.ctrl.state.receive_payload.received = 0;
+ ret = lttng_dynamic_buffer_set_size(reception_buffer,
+ header.data_size);
+ if (ret) {
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end;
+ }
+
+ if (header.data_size == 0) {
+ /*
+ * Manually invoke the next state as the poll loop
+ * will not wake-up to allow us to proceed further.
+ */
+ status = relay_process_control_receive_payload(conn);
+ }
+end:
+ return status;
+}
+
+/*
+ * Process the commands received on the control socket
+ */
+static enum relay_connection_status relay_process_control(
+ struct relay_connection *conn)
+{
+ enum relay_connection_status status;
+
+ switch (conn->protocol.ctrl.state_id) {
+ case CTRL_CONNECTION_STATE_RECEIVE_HEADER:
+ status = relay_process_control_receive_header(conn);
+ break;
+ case CTRL_CONNECTION_STATE_RECEIVE_PAYLOAD:
+ status = relay_process_control_receive_payload(conn);
+ break;
+ default:
+ ERR("Unknown control connection protocol state encountered.");
+ abort();
+ }
+
+ return status;
+}
+
/*
* Handle index for a data stream.
*
* Return 0 on success else a negative value.
*/
static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
- int rotate_index)
+ bool rotate_index)
{
int ret = 0;
uint64_t data_offset;
return ret;
}
-/*
- * relay_process_data: Process the data received on the data socket
- */
-static int relay_process_data(struct relay_connection *conn)
+static enum relay_connection_status relay_process_data_receive_header(
+ struct relay_connection *conn)
{
- int ret = 0, rotate_index = 0;
- ssize_t size_ret;
+ int ret;
+ enum relay_connection_status status = RELAY_CONNECTION_STATUS_OK;
+ struct data_connection_state_receive_header *state =
+ &conn->protocol.data.state.receive_header;
+ struct lttcomm_relayd_data_hdr header;
struct relay_stream *stream;
- struct lttcomm_relayd_data_hdr data_hdr;
- uint64_t stream_id;
- uint64_t net_seq_num;
- uint32_t data_size;
- struct relay_session *session;
- bool new_stream = false, close_requested = false;
- size_t chunk_size = RECV_DATA_BUFFER_SIZE;
- size_t recv_off = 0;
- char data_buffer[chunk_size];
- ret = conn->sock->ops->recvmsg(conn->sock, &data_hdr,
- sizeof(struct lttcomm_relayd_data_hdr), 0);
- if (ret <= 0) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Unable to receive data header on sock %d", conn->sock->fd);
+ assert(state->left_to_receive != 0);
+
+ ret = conn->sock->ops->recvmsg(conn->sock,
+ state->header_reception_buffer + state->received,
+ state->left_to_receive, MSG_DONTWAIT);
+ if (ret < 0) {
+ if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ PERROR("Unable to receive data header on sock %d", conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_ERROR;
}
- ret = -1;
+ goto end;
+ } else if (ret == 0) {
+ /* Orderly shutdown. Not necessary to print an error. */
+ DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_CLOSED;
goto end;
}
- stream_id = be64toh(data_hdr.stream_id);
- stream = stream_get_by_id(stream_id);
- if (!stream) {
- ERR("relay_process_data: Cannot find stream %" PRIu64, stream_id);
- ret = -1;
+ assert(ret > 0);
+ assert(ret <= state->left_to_receive);
+
+ state->left_to_receive -= ret;
+ state->received += ret;
+
+ if (state->left_to_receive > 0) {
+ /*
+ * Can't transition to the protocol's next state, wait to
+ * receive the rest of the header.
+ */
+ DBG3("Partial reception of data connection header (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)",
+ state->received, state->left_to_receive,
+ conn->sock->fd);
+ ret = 0;
goto end;
}
- session = stream->trace->session;
- data_size = be32toh(data_hdr.data_size);
- net_seq_num = be64toh(data_hdr.net_seq_num);
+ /* Transition to next state: receiving the payload. */
+ conn->protocol.data.state_id = DATA_CONNECTION_STATE_RECEIVE_PAYLOAD;
+
+ memcpy(&header, state->header_reception_buffer, sizeof(header));
+ header.circuit_id = be64toh(header.circuit_id);
+ header.stream_id = be64toh(header.stream_id);
+ header.data_size = be32toh(header.data_size);
+ header.net_seq_num = be64toh(header.net_seq_num);
+ header.padding_size = be32toh(header.padding_size);
+ memcpy(&conn->protocol.data.state.receive_payload.header, &header, sizeof(header));
- DBG3("Receiving data of size %u for stream id %" PRIu64 " seqnum %" PRIu64,
- data_size, stream_id, net_seq_num);
+ conn->protocol.data.state.receive_payload.left_to_receive =
+ header.data_size;
+ conn->protocol.data.state.receive_payload.received = 0;
+ conn->protocol.data.state.receive_payload.rotate_index = false;
+
+ DBG("Received data connection header on fd %i: circuit_id = %" PRIu64 ", stream_id = %" PRIu64 ", data_size = %" PRIu32 ", net_seq_num = %" PRIu64 ", padding_size = %" PRIu32,
+ conn->sock->fd, header.circuit_id,
+ header.stream_id, header.data_size,
+ header.net_seq_num, header.padding_size);
+
+ stream = stream_get_by_id(header.stream_id);
+ if (!stream) {
+ DBG("relay_process_data_receive_payload: Cannot find stream %" PRIu64,
+ header.stream_id);
+ /* Protocol error. */
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end;
+ }
pthread_mutex_lock(&stream->lock);
/* Check if a rotation is needed. */
if (stream->tracefile_size > 0 &&
- (stream->tracefile_size_current + data_size) >
+ (stream->tracefile_size_current + header.data_size) >
stream->tracefile_size) {
uint64_t old_id, new_id;
-1, stream->stream_fd->fd,
&new_id, &stream->stream_fd->fd);
if (ret < 0) {
- ERR("Rotating stream output file");
+ ERR("Failed to rotate stream output file");
+ status = RELAY_CONNECTION_STATUS_ERROR;
goto end_stream_unlock;
}
+
/*
* Reset current size because we just performed a stream
* rotation.
*/
stream->tracefile_size_current = 0;
- rotate_index = 1;
+ conn->protocol.data.state.receive_payload.rotate_index = true;
}
- /*
- * Index are handled in protocol version 2.4 and above. Also,
- * snapshot and index are NOT supported.
- */
- if (session->minor >= 4 && !session->snapshot) {
- ret = handle_index_data(stream, net_seq_num, rotate_index);
- if (ret < 0) {
- ERR("handle_index_data: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d",
- stream->stream_handle, net_seq_num, ret);
+ ret = 0;
+end_stream_unlock:
+ pthread_mutex_unlock(&stream->lock);
+ stream_put(stream);
+end:
+ return status;
+}
+
+static enum relay_connection_status relay_process_data_receive_payload(
+ struct relay_connection *conn)
+{
+ int ret;
+ enum relay_connection_status status = RELAY_CONNECTION_STATUS_OK;
+ struct relay_stream *stream;
+ struct data_connection_state_receive_payload *state =
+ &conn->protocol.data.state.receive_payload;
+ const size_t chunk_size = RECV_DATA_BUFFER_SIZE;
+ char data_buffer[chunk_size];
+ bool partial_recv = false;
+ bool new_stream = false, close_requested = false;
+ uint64_t left_to_receive = state->left_to_receive;
+ struct relay_session *session;
+
+ DBG3("Receiving data for stream id %" PRIu64 " seqnum %" PRIu64 ", %" PRIu64" bytes received, %" PRIu64 " bytes left to receive",
+ state->header.stream_id, state->header.net_seq_num,
+ state->received, left_to_receive);
+
+ stream = stream_get_by_id(state->header.stream_id);
+ if (!stream) {
+ /* Protocol error. */
+ ERR("relay_process_data_receive_payload: cannot find stream %" PRIu64,
+ state->header.stream_id);
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end;
+ }
+
+ pthread_mutex_lock(&stream->lock);
+ session = stream->trace->session;
+ if (!conn->session) {
+ ret = connection_set_session(conn, session);
+ if (ret) {
+ status = RELAY_CONNECTION_STATUS_ERROR;
goto end_stream_unlock;
}
}
- for (recv_off = 0; recv_off < data_size; recv_off += chunk_size) {
- size_t recv_size = min(data_size - recv_off, chunk_size);
+ /*
+ * The size of the "chunk" received on any iteration is bounded by:
+ * - the data left to receive,
+ * - the data immediately available on the socket,
+ * - the on-stack data buffer
+ */
+ while (left_to_receive > 0 && !partial_recv) {
+ ssize_t write_ret;
+ size_t recv_size = min(left_to_receive, chunk_size);
- ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, recv_size, 0);
- if (ret <= 0) {
- if (ret == 0) {
- /* Orderly shutdown. Not necessary to print an error. */
- DBG("Socket %d did an orderly shutdown", conn->sock->fd);
- } else {
- ERR("Socket %d error %d", conn->sock->fd, ret);
+ ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
+ recv_size, MSG_DONTWAIT);
+ if (ret < 0) {
+ if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ PERROR("Socket %d error", conn->sock->fd);
+ status = RELAY_CONNECTION_STATUS_ERROR;
}
- ret = -1;
goto end_stream_unlock;
+ } else if (ret == 0) {
+ /* No more data ready to be consumed on socket. */
+ DBG3("No more data ready for consumption on data socket of stream id %" PRIu64,
+ state->header.stream_id);
+ status = RELAY_CONNECTION_STATUS_CLOSED;
+ break;
+ } else if (ret < (int) recv_size) {
+ /*
+ * All the data available on the socket has been
+ * consumed.
+ */
+ partial_recv = true;
}
+ recv_size = ret;
+
/* Write data to stream output fd. */
- size_ret = lttng_write(stream->stream_fd->fd, data_buffer,
+ write_ret = lttng_write(stream->stream_fd->fd, data_buffer,
recv_size);
- if (size_ret < recv_size) {
+ if (write_ret < (ssize_t) recv_size) {
ERR("Relay error writing data to file");
- ret = -1;
+ status = RELAY_CONNECTION_STATUS_ERROR;
goto end_stream_unlock;
}
+ left_to_receive -= recv_size;
+ state->received += recv_size;
+ state->left_to_receive = left_to_receive;
+
DBG2("Relay wrote %zd bytes to tracefile for stream id %" PRIu64,
- size_ret, stream->stream_handle);
+ write_ret, stream->stream_handle);
+ }
+
+ if (state->left_to_receive > 0) {
+ /*
+ * Did not receive all the data expected, wait for more data to
+ * become available on the socket.
+ */
+ DBG3("Partial receive on data connection of stream id %" PRIu64 ", %" PRIu64 " bytes received, %" PRIu64 " bytes left to receive",
+ state->header.stream_id, state->received,
+ state->left_to_receive);
+ goto end_stream_unlock;
}
ret = write_padding_to_file(stream->stream_fd->fd,
- be32toh(data_hdr.padding_size));
- if (ret < 0) {
+ state->header.padding_size);
+ if ((int64_t) ret < (int64_t) state->header.padding_size) {
ERR("write_padding_to_file: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d",
- stream->stream_handle, net_seq_num, ret);
+ stream->stream_handle,
+ state->header.net_seq_num, ret);
+ status = RELAY_CONNECTION_STATUS_ERROR;
goto end_stream_unlock;
}
- stream->tracefile_size_current +=
- data_size + be32toh(data_hdr.padding_size);
+
+
+ if (session->minor >= 4 && !session->snapshot) {
+ ret = handle_index_data(stream, state->header.net_seq_num,
+ state->rotate_index);
+ if (ret < 0) {
+ ERR("handle_index_data: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d",
+ stream->stream_handle,
+ state->header.net_seq_num, ret);
+ status = RELAY_CONNECTION_STATUS_ERROR;
+ goto end_stream_unlock;
+ }
+ }
+
+ stream->tracefile_size_current += state->header.data_size +
+ state->header.padding_size;
+
if (stream->prev_seq == -1ULL) {
new_stream = true;
}
- stream->prev_seq = net_seq_num;
+ stream->prev_seq = state->header.net_seq_num;
+
+ /*
+ * Resetting the protocol state (to RECEIVE_HEADER) will trash the
+ * contents of *state which are aliased (union) to the same location as
+ * the new state. Don't use it beyond this point.
+ */
+ connection_reset_protocol_state(conn);
+ state = NULL;
end_stream_unlock:
close_requested = stream->close_requested;
pthread_mutex_unlock(&stream->lock);
- if (close_requested) {
+ if (close_requested && left_to_receive == 0) {
try_stream_close(stream);
}
uatomic_set(&session->new_streams, 1);
pthread_mutex_unlock(&session->lock);
}
+
stream_put(stream);
end:
- return ret;
+ return status;
+}
+
+/*
+ * relay_process_data: Process the data received on the data socket
+ */
+static enum relay_connection_status relay_process_data(
+ struct relay_connection *conn)
+{
+ enum relay_connection_status status;
+
+ switch (conn->protocol.data.state_id) {
+ case DATA_CONNECTION_STATE_RECEIVE_HEADER:
+ status = relay_process_data_receive_header(conn);
+ break;
+ case DATA_CONNECTION_STATE_RECEIVE_PAYLOAD:
+ status = relay_process_data_receive_payload(conn);
+ break;
+ default:
+ ERR("Unexpected data connection communication state.");
+ abort();
+ }
+
+ return status;
}
static void cleanup_connection_pollfd(struct lttng_poll_event *events, int pollfd)
struct lttng_poll_event events;
struct lttng_ht *relay_connections_ht;
struct lttng_ht_iter iter;
- struct lttcomm_relayd_hdr recv_hdr;
struct relay_connection *destroy_conn = NULL;
DBG("[thread] Relay worker started");
assert(ctrl_conn->type == RELAY_CONTROL);
if (revents & LPOLLIN) {
- ret = ctrl_conn->sock->ops->recvmsg(ctrl_conn->sock,
- &recv_hdr, sizeof(recv_hdr), 0);
- if (ret <= 0) {
- /* Connection closed */
- relay_thread_close_connection(&events, pollfd,
- ctrl_conn);
- } else {
- ret = relay_process_control(&recv_hdr, ctrl_conn);
- if (ret < 0) {
- /* Clear the session on error. */
- relay_thread_close_connection(&events,
- pollfd, ctrl_conn);
+ enum relay_connection_status status;
+
+ status = relay_process_control(ctrl_conn);
+ if (status != RELAY_CONNECTION_STATUS_OK) {
+ /*
+ * On socket error flag the session as aborted to force
+ * the cleanup of its stream otherwise it can leak
+ * during the lifetime of the relayd.
+ *
+ * This prevents situations in which streams can be
+ * left opened because an index was received, the
+ * control connection is closed, and the data
+ * connection is closed (uncleanly) before the packet's
+ * data provided.
+ *
+ * Since the control connection encountered an error,
+ * it is okay to be conservative and close the
+ * session right now as we can't rely on the protocol
+ * being respected anymore.
+ */
+ if (status == RELAY_CONNECTION_STATUS_ERROR) {
+ session_abort(ctrl_conn->session);
}
- seen_control = 1;
+
+ /* Clear the connection on error or close. */
+ relay_thread_close_connection(&events,
+ pollfd,
+ ctrl_conn);
}
+ seen_control = 1;
} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
relay_thread_close_connection(&events,
pollfd, ctrl_conn);
assert(data_conn->type == RELAY_DATA);
if (revents & LPOLLIN) {
- ret = relay_process_data(data_conn);
- /* Connection closed */
- if (ret < 0) {
+ enum relay_connection_status status;
+
+ status = relay_process_data(data_conn);
+ /* Connection closed or error. */
+ if (status != RELAY_CONNECTION_STATUS_OK) {
+ /*
+ * On socket error flag the session as aborted to force
+ * the cleanup of its stream otherwise it can leak
+ * during the lifetime of the relayd.
+ *
+ * This prevents situations in which streams can be
+ * left opened because an index was received, the
+ * control connection is closed, and the data
+ * connection is closed (uncleanly) before the packet's
+ * data provided.
+ *
+ * Since the data connection encountered an error,
+ * it is okay to be conservative and close the
+ * session right now as we can't rely on the protocol
+ * being respected anymore.
+ */
+ if (status == RELAY_CONNECTION_STATUS_ERROR) {
+ session_abort(data_conn->session);
+ }
relay_thread_close_connection(&events, pollfd,
data_conn);
/*
destroy_conn,
sock_n.node) {
health_code_update();
+
+ session_abort(destroy_conn->session);
+
/*
* No need to grab another ref, because we own
* destroy_conn.
int ret = 0, retval = 0;
void *status;
- /* Parse arguments */
+ /* Parse environment variables */
+ parse_env_options();
+
+ /*
+ * Parse arguments.
+ * Command line arguments overwrite environment.
+ */
progname = argv[0];
if (set_options(argc, argv)) {
retval = -1;
goto exit_options;
}
+ relayd_config_log();
+
+ if (opt_print_version) {
+ print_version();
+ retval = 0;
+ goto exit_options;
+ }
+
/* Try to create directory if -o, --output is specified. */
if (opt_output_path) {
if (*opt_output_path != '/') {
}
}
+
+ if (opt_working_directory) {
+ ret = utils_change_working_dir(opt_working_directory);
+ if (ret) {
+ ERR("Changing working directory");
+ goto exit_options;
+ }
+ }
+
/* Initialize thread health monitoring */
health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES);
if (!health_relayd) {
health_app_destroy(health_relayd);
exit_health_app_create:
exit_options:
+ /*
+ * Wait for all pending call_rcu work to complete before tearing
+ * down data structures. call_rcu worker may be trying to
+ * perform lookups in those structures.
+ */
+ rcu_barrier();
relayd_cleanup();
/* Ensure all prior call_rcu are done. */
projects / lttng-tools.git / blobdiff