X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=ccb23c065ca7aaeb8037fc30a42016fd7c9c9f3b;hp=9e10c83e02f7ec583bff72cd5b6d70b42870dca1;hb=a4baae1b0463bc4ce65c2a458c4a941e7fabc594;hpb=ffe600149a7608221985751e1bf293234bf2545c diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c index 9e10c83e0..ccb23c065 100644 --- a/src/common/relayd/relayd.c +++ b/src/common/relayd/relayd.c @@ -26,13 +26,14 @@ #include #include #include +#include #include "relayd.h" /* * Send command. Fill up the header and append the data. */ -static int send_command(struct lttcomm_sock *sock, +static int send_command(struct lttcomm_relayd_sock *rsock, enum lttcomm_relayd_command cmd, void *data, size_t size, int flags) { @@ -41,6 +42,10 @@ static int send_command(struct lttcomm_sock *sock, char *buf; uint64_t buf_size = sizeof(header); + if (rsock->sock.fd < 0) { + return -ECONNRESET; + } + if (data) { buf_size += size; } @@ -65,7 +70,7 @@ static int send_command(struct lttcomm_sock *sock, memcpy(buf + sizeof(header), data, size); } - ret = sock->ops->sendmsg(sock, buf, buf_size, flags); + ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags); if (ret < 0) { ret = -errno; goto error; @@ -83,20 +88,24 @@ alloc_error: * Receive reply data on socket. This MUST be call after send_command or else * could result in unexpected behavior(s). */ -static int recv_reply(struct lttcomm_sock *sock, void *data, size_t size) +static int recv_reply(struct lttcomm_relayd_sock *rsock, void *data, size_t size) { int ret; - DBG3("Relayd waiting for reply of size %ld", size); + if (rsock->sock.fd < 0) { + return -ECONNRESET; + } - ret = sock->ops->recvmsg(sock, data, size, 0); + DBG3("Relayd waiting for reply of size %zu", size); + + ret = rsock->sock.ops->recvmsg(&rsock->sock, data, size, 0); if (ret <= 0 || ret != size) { if (ret == 0) { /* Orderly shutdown. */ - DBG("Socket %d has performed an orderly shutdown", sock->fd); + DBG("Socket %d has performed an orderly shutdown", rsock->sock.fd); } else { - DBG("Receiving reply failed on sock %d for size %lu with ret %d", - sock->fd, size, ret); + DBG("Receiving reply failed on sock %d for size %zu with ret %d", + rsock->sock.fd, size, ret); } /* Always return -1 here and the caller can use errno. */ ret = -1; @@ -107,6 +116,50 @@ error: return ret; } +/* + * Starting at 2.4, RELAYD_CREATE_SESSION takes additional parameters to + * support the live reading capability. + */ +static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock, + uint64_t *session_id, char *session_name, char *hostname, + int session_live_timer, unsigned int snapshot) +{ + int ret; + struct lttcomm_relayd_create_session_2_4 msg; + + strncpy(msg.session_name, session_name, sizeof(msg.session_name)); + strncpy(msg.hostname, hostname, sizeof(msg.hostname)); + msg.live_timer = htobe32(session_live_timer); + msg.snapshot = htobe32(snapshot); + + /* Send command */ + ret = send_command(rsock, RELAYD_CREATE_SESSION, &msg, sizeof(msg), 0); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + +/* + * RELAYD_CREATE_SESSION from 2.1 to 2.3. + */ +static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock, + uint64_t *session_id) +{ + int ret; + + /* Send command */ + ret = send_command(rsock, RELAYD_CREATE_SESSION, NULL, 0, 0); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + /* * Send a RELAYD_CREATE_SESSION command to the relayd with the given socket and * set session_id of the relayd if we have a successful reply from the relayd. @@ -114,24 +167,37 @@ error: * On success, return 0 else a negative value which is either an errno error or * a lttng error code from the relayd. */ -int relayd_create_session(struct lttcomm_sock *sock, uint64_t *session_id) +int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id, + char *session_name, char *hostname, int session_live_timer, + unsigned int snapshot) { int ret; struct lttcomm_relayd_status_session reply; - assert(sock); + assert(rsock); assert(session_id); DBG("Relayd create session"); - /* Send command */ - ret = send_command(sock, RELAYD_CREATE_SESSION, NULL, 0, 0); + switch(rsock->minor) { + case 1: + case 2: + case 3: + ret = relayd_create_session_2_1(rsock, session_id); + break; + case 4: + default: + ret = relayd_create_session_2_4(rsock, session_id, session_name, + hostname, session_live_timer, snapshot); + break; + } + if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -160,31 +226,48 @@ error: * * On success return 0 else return ret_code negative value. */ -int relayd_add_stream(struct lttcomm_sock *sock, const char *channel_name, - const char *pathname, uint64_t *stream_id) +int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name, + const char *pathname, uint64_t *stream_id, + uint64_t tracefile_size, uint64_t tracefile_count) { int ret; struct lttcomm_relayd_add_stream msg; + struct lttcomm_relayd_add_stream_2_2 msg_2_2; struct lttcomm_relayd_status_stream reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); assert(channel_name); assert(pathname); DBG("Relayd adding stream for channel name %s", channel_name); - strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name)); - strncpy(msg.pathname, pathname, sizeof(msg.pathname)); + /* Compat with relayd 2.1 */ + if (rsock->minor == 1) { + strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name)); + strncpy(msg.pathname, pathname, sizeof(msg.pathname)); - /* Send command */ - ret = send_command(sock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0); - if (ret < 0) { - goto error; + /* Send command */ + ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0); + if (ret < 0) { + goto error; + } + } else { + /* Compat with relayd 2.2+ */ + strncpy(msg_2_2.channel_name, channel_name, sizeof(msg_2_2.channel_name)); + strncpy(msg_2_2.pathname, pathname, sizeof(msg_2_2.pathname)); + msg_2_2.tracefile_size = htobe64(tracefile_size); + msg_2_2.tracefile_count = htobe64(tracefile_count); + + /* Send command */ + ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg_2_2, sizeof(msg_2_2), 0); + if (ret < 0) { + goto error; + } } /* Waiting for reply */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -210,34 +293,89 @@ error: return ret; } +/* + * Inform the relay that all the streams for the current channel has been sent. + * + * On success return 0 else return ret_code negative value. + */ +int relayd_streams_sent(struct lttcomm_relayd_sock *rsock) +{ + int ret; + struct lttcomm_relayd_generic_reply reply; + + /* Code flow error. Safety net. */ + assert(rsock); + + DBG("Relayd sending streams sent."); + + /* This feature was introduced in 2.4, ignore it for earlier versions. */ + if (rsock->minor < 4) { + ret = 0; + goto end; + } + + /* Send command */ + ret = send_command(rsock, RELAYD_STREAMS_SENT, NULL, 0, 0); + if (ret < 0) { + goto error; + } + + /* Waiting for reply */ + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); + if (ret < 0) { + goto error; + } + + /* Back to host bytes order. */ + reply.ret_code = be32toh(reply.ret_code); + + /* Return session id or negative ret code. */ + if (reply.ret_code != LTTNG_OK) { + ret = -1; + ERR("Relayd streams sent replied error %d", reply.ret_code); + goto error; + } else { + /* Success */ + ret = 0; + } + + DBG("Relayd streams sent success"); + +error: +end: + return ret; +} + /* * Check version numbers on the relayd. + * If major versions are compatible, we assign minor_to_use to the + * minor version of the procotol we are going to use for this session. * * Return 0 if compatible else negative value. */ -int relayd_version_check(struct lttcomm_sock *sock, uint32_t major, - uint32_t minor) +int relayd_version_check(struct lttcomm_relayd_sock *rsock) { int ret; struct lttcomm_relayd_version msg; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); - DBG("Relayd version check for major.minor %u.%u", major, minor); + DBG("Relayd version check for major.minor %u.%u", rsock->major, + rsock->minor); /* Prepare network byte order before transmission. */ - msg.major = htobe32(major); - msg.minor = htobe32(minor); + msg.major = htobe32(rsock->major); + msg.minor = htobe32(rsock->minor); /* Send command */ - ret = send_command(sock, RELAYD_VERSION, (void *) &msg, sizeof(msg), 0); + ret = send_command(rsock, RELAYD_VERSION, (void *) &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &msg, sizeof(msg)); + ret = recv_reply(rsock, (void *) &msg, sizeof(msg)); if (ret < 0) { goto error; } @@ -251,30 +389,28 @@ int relayd_version_check(struct lttcomm_sock *sock, uint32_t major, * communication is not possible. Only major version equal can talk to each * other. If the minor version differs, the lowest version is used by both * sides. - * - * For now, before 2.1.0 stable release, we don't have to check the minor - * because this new mechanism with the relayd will only be available with - * 2.1 and NOT 2.0.x. */ - if (msg.major == major) { - /* Compatible */ - ret = 0; - DBG2("Relayd version is compatible"); + if (msg.major != rsock->major) { + /* Not compatible */ + ret = -1; + DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)", + msg.major, rsock->major); goto error; } /* - * After 2.1.0 release, for the 2.2 release, at this point will have to - * check the minor version in order for the session daemon to know which - * structure to use to communicate with the relayd. If the relayd's minor - * version is higher, it will adapt to our version so we can continue to - * use the latest relayd communication data structure. + * If the relayd's minor version is higher, it will adapt to our version so + * we can continue to use the latest relayd communication data structure. + * If the received minor version is higher, the relayd should adapt to us. */ + if (rsock->minor > msg.minor) { + rsock->minor = msg.minor; + } - /* Version number not compatible */ - DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)", - msg.major, major); - ret = -1; + /* Version number compatible */ + DBG2("Relayd version is compatible, using protocol version %u.%u", + rsock->major, rsock->minor); + ret = 0; error: return ret; @@ -285,17 +421,17 @@ error: * * On success return 0 else return ret_code negative value. */ -int relayd_send_metadata(struct lttcomm_sock *sock, size_t len) +int relayd_send_metadata(struct lttcomm_relayd_sock *rsock, size_t len) { int ret; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd sending metadata of size %zu", len); /* Send command */ - ret = send_command(sock, RELAYD_SEND_METADATA, NULL, len, 0); + ret = send_command(rsock, RELAYD_SEND_METADATA, NULL, len, 0); if (ret < 0) { goto error; } @@ -313,20 +449,27 @@ error: } /* - * Connect to relay daemon with an allocated lttcomm_sock. + * Connect to relay daemon with an allocated lttcomm_relayd_sock. */ -int relayd_connect(struct lttcomm_sock *sock) +int relayd_connect(struct lttcomm_relayd_sock *rsock) { /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); + + if (!rsock->sock.ops) { + /* + * Attempting a connect on a non-initialized socket. + */ + return -ECONNRESET; + } DBG3("Relayd connect ..."); - return sock->ops->connect(sock); + return rsock->sock.ops->connect(&rsock->sock); } /* - * Close relayd socket with an allocated lttcomm_sock. + * Close relayd socket with an allocated lttcomm_relayd_sock. * * If no socket operations are found, simply return 0 meaning that everything * is fine. Without operations, the socket can not possibly be opened or used. @@ -338,30 +481,31 @@ int relayd_connect(struct lttcomm_sock *sock) * Return the close returned value. On error, a negative value is usually * returned back from close(2). */ -int relayd_close(struct lttcomm_sock *sock) +int relayd_close(struct lttcomm_relayd_sock *rsock) { int ret; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); /* An invalid fd is fine, return success. */ - if (sock->fd < 0) { + if (rsock->sock.fd < 0) { ret = 0; goto end; } - DBG3("Relayd closing socket %d", sock->fd); + DBG3("Relayd closing socket %d", rsock->sock.fd); - if (sock->ops) { - ret = sock->ops->close(sock); + if (rsock->sock.ops) { + ret = rsock->sock.ops->close(&rsock->sock); } else { /* Default call if no specific ops found. */ - ret = close(sock->fd); + ret = close(rsock->sock.fd); if (ret < 0) { PERROR("relayd_close default close"); } } + rsock->sock.fd = -1; end: return ret; @@ -370,16 +514,20 @@ end: /* * Send data header structure to the relayd. */ -int relayd_send_data_hdr(struct lttcomm_sock *sock, +int relayd_send_data_hdr(struct lttcomm_relayd_sock *rsock, struct lttcomm_relayd_data_hdr *hdr, size_t size) { int ret; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); assert(hdr); - DBG3("Relayd sending data header of size %ld", size); + if (rsock->sock.fd < 0) { + return -ECONNRESET; + } + + DBG3("Relayd sending data header of size %zu", size); /* Again, safety net */ if (size == 0) { @@ -387,7 +535,7 @@ int relayd_send_data_hdr(struct lttcomm_sock *sock, } /* Only send data header. */ - ret = sock->ops->sendmsg(sock, hdr, size, 0); + ret = rsock->sock.ops->sendmsg(&rsock->sock, hdr, size, 0); if (ret < 0) { ret = -errno; goto error; @@ -405,7 +553,7 @@ error: /* * Send close stream command to the relayd. */ -int relayd_send_close_stream(struct lttcomm_sock *sock, uint64_t stream_id, +int relayd_send_close_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id, uint64_t last_net_seq_num) { int ret; @@ -413,7 +561,7 @@ int relayd_send_close_stream(struct lttcomm_sock *sock, uint64_t stream_id, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd closing stream id %" PRIu64, stream_id); @@ -421,13 +569,13 @@ int relayd_send_close_stream(struct lttcomm_sock *sock, uint64_t stream_id, msg.last_net_seq_num = htobe64(last_net_seq_num); /* Send command */ - ret = send_command(sock, RELAYD_CLOSE_STREAM, (void *) &msg, sizeof(msg), 0); + ret = send_command(rsock, RELAYD_CLOSE_STREAM, (void *) &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -454,7 +602,7 @@ error: * * Return 0 if NOT pending, 1 if so and a negative value on error. */ -int relayd_data_pending(struct lttcomm_sock *sock, uint64_t stream_id, +int relayd_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t stream_id, uint64_t last_net_seq_num) { int ret; @@ -462,7 +610,7 @@ int relayd_data_pending(struct lttcomm_sock *sock, uint64_t stream_id, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd data pending for stream id %" PRIu64, stream_id); @@ -470,14 +618,14 @@ int relayd_data_pending(struct lttcomm_sock *sock, uint64_t stream_id, msg.last_net_seq_num = htobe64(last_net_seq_num); /* Send command */ - ret = send_command(sock, RELAYD_DATA_PENDING, (void *) &msg, + ret = send_command(rsock, RELAYD_DATA_PENDING, (void *) &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -502,7 +650,7 @@ error: /* * Check on the relayd side for a quiescent state on the control socket. */ -int relayd_quiescent_control(struct lttcomm_sock *sock, +int relayd_quiescent_control(struct lttcomm_relayd_sock *rsock, uint64_t metadata_stream_id) { int ret; @@ -510,20 +658,20 @@ int relayd_quiescent_control(struct lttcomm_sock *sock, struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd checking quiescent control state"); msg.stream_id = htobe64(metadata_stream_id); /* Send command */ - ret = send_command(sock, RELAYD_QUIESCENT_CONTROL, &msg, sizeof(msg), 0); + ret = send_command(rsock, RELAYD_QUIESCENT_CONTROL, &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -547,27 +695,27 @@ error: /* * Begin a data pending command for a specific session id. */ -int relayd_begin_data_pending(struct lttcomm_sock *sock, uint64_t id) +int relayd_begin_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id) { int ret; struct lttcomm_relayd_begin_data_pending msg; struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd begin data pending"); msg.session_id = htobe64(id); /* Send command */ - ret = send_command(sock, RELAYD_BEGIN_DATA_PENDING, &msg, sizeof(msg), 0); + ret = send_command(rsock, RELAYD_BEGIN_DATA_PENDING, &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } @@ -593,44 +741,104 @@ error: * Return 0 on success and set is_data_inflight to 0 if no data is being * streamed or 1 if it is the case. */ -int relayd_end_data_pending(struct lttcomm_sock *sock, uint64_t id, +int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id, unsigned int *is_data_inflight) { - int ret; + int ret, recv_ret; struct lttcomm_relayd_end_data_pending msg; struct lttcomm_relayd_generic_reply reply; /* Code flow error. Safety net. */ - assert(sock); + assert(rsock); DBG("Relayd end data pending"); msg.session_id = htobe64(id); /* Send command */ - ret = send_command(sock, RELAYD_END_DATA_PENDING, &msg, sizeof(msg), 0); + ret = send_command(rsock, RELAYD_END_DATA_PENDING, &msg, sizeof(msg), 0); if (ret < 0) { goto error; } /* Receive response */ - ret = recv_reply(sock, (void *) &reply, sizeof(reply)); + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); if (ret < 0) { goto error; } - reply.ret_code = be32toh(reply.ret_code); - if (reply.ret_code < 0) { - ret = reply.ret_code; + recv_ret = be32toh(reply.ret_code); + if (recv_ret < 0) { + ret = recv_ret; goto error; } - *is_data_inflight = reply.ret_code; + *is_data_inflight = recv_ret; - DBG("Relayd end data pending is data inflight: %d", reply.ret_code); + DBG("Relayd end data pending is data inflight: %d", recv_ret); return 0; error: return ret; } + +/* + * Send index to the relayd. + */ +int relayd_send_index(struct lttcomm_relayd_sock *rsock, + struct ctf_packet_index *index, uint64_t relay_stream_id, + uint64_t net_seq_num) +{ + int ret; + struct lttcomm_relayd_index msg; + struct lttcomm_relayd_generic_reply reply; + + /* Code flow error. Safety net. */ + assert(rsock); + + if (rsock->minor < 4) { + DBG("Not sending indexes before protocol 2.4"); + ret = 0; + goto error; + } + + DBG("Relayd sending index for stream ID %" PRIu64, relay_stream_id); + + msg.relay_stream_id = htobe64(relay_stream_id); + msg.net_seq_num = htobe64(net_seq_num); + + /* The index is already in big endian. */ + msg.packet_size = index->packet_size; + msg.content_size = index->content_size; + msg.timestamp_begin = index->timestamp_begin; + msg.timestamp_end = index->timestamp_end; + msg.events_discarded = index->events_discarded; + msg.stream_id = index->stream_id; + + /* Send command */ + ret = send_command(rsock, RELAYD_SEND_INDEX, &msg, sizeof(msg), 0); + if (ret < 0) { + goto error; + } + + /* Receive response */ + ret = recv_reply(rsock, (void *) &reply, sizeof(reply)); + if (ret < 0) { + goto error; + } + + reply.ret_code = be32toh(reply.ret_code); + + /* Return session id or negative ret code. */ + if (reply.ret_code != LTTNG_OK) { + ret = -1; + ERR("Relayd send index replied error %d", reply.ret_code); + } else { + /* Success */ + ret = 0; + } + +error: + return ret; +}