Make the consumer sends a ACK after each command

[lttng-tools.git] / src / bin / lttng-relayd / main.c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index c099061ccf7339f03741fc3cda59fb5ae60901a6..2a7152b892192f7e683bf881b2b106af0a2da36c 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -894,7 +894,10 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
                        stream = caa_container_of(node,
                                        struct relay_stream, stream_n);
                        if (stream->session == cmd->session) {
-                               close(stream->fd);
+                               ret = close(stream->fd);
+                               if (ret < 0) {
+                                       PERROR("close stream fd on delete session");
+                               }
                                ret = lttng_ht_del(streams_ht, &iter);
                                assert(!ret);
                                call_rcu(&stream->rcu_node,
@@ -929,7 +932,7 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
 
        /* FIXME : use data_size for something ? */
        ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info,
-                       sizeof(struct lttcomm_relayd_add_stream), MSG_WAITALL);
+                       sizeof(struct lttcomm_relayd_add_stream), 0);
        if (ret < sizeof(struct lttcomm_relayd_add_stream)) {
                ERR("Relay didn't receive valid add_stream struct size : %d", ret);
                ret = -1;
@@ -1025,7 +1028,7 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
        }
 
        ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info,
-                       sizeof(struct lttcomm_relayd_close_stream), MSG_WAITALL);
+                       sizeof(struct lttcomm_relayd_close_stream), 0);
        if (ret < sizeof(struct lttcomm_relayd_close_stream)) {
                ERR("Relay didn't receive valid add_stream struct size : %d", ret);
                ret = -1;
@@ -1055,7 +1058,10 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
        if (close_stream_check(stream)) {
                int delret;
 
-               close(stream->fd);
+               delret = close(stream->fd);
+               if (delret < 0) {
+                       PERROR("close stream");
+               }
                delret = lttng_ht_del(streams_ht, &iter);
                assert(!delret);
                call_rcu(&stream->rcu_node,
@@ -1226,8 +1232,7 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
        }
        memset(data_buffer, 0, data_size);
        DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size);
-       ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size,
-                       MSG_WAITALL);
+       ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0);
        if (ret < 0 || ret != data_size) {
                ret = -1;
                ERR("Relay didn't receive the whole metadata");
@@ -1275,7 +1280,7 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
                struct relay_command *cmd)
 {
        int ret;
-       struct lttcomm_relayd_version reply;
+       struct lttcomm_relayd_version reply, msg;
        struct relay_session *session;
 
        if (cmd->session == NULL) {
@@ -1293,6 +1298,21 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
        }
        session->version_check_done = 1;
 
+       /* Get version from the other side. */
+       ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0);
+       if (ret < 0 || ret != sizeof(msg)) {
+               ret = -1;
+               ERR("Relay failed to receive the version values.");
+               goto end;
+       }
+
+       /*
+        * For now, we just ignore the received version but after 2.1 stable
+        * release, a check must be done to see if we either adapt to the other
+        * side version (which MUST be lower than us) or keep the latest data
+        * structure considering that the other side will adapt.
+        */
+
        ret = sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
        if (ret < 2) {
                ERR("Error in scanning version");
@@ -1337,7 +1357,7 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
                goto end_no_session;
        }
 
-       ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), MSG_WAITALL);
+       ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), 0);
        if (ret < sizeof(msg)) {
                ERR("Relay didn't receive valid data_pending struct size : %d", ret);
                ret = -1;
@@ -1472,7 +1492,7 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
        uint32_t data_size;
 
        ret = cmd->sock->ops->recvmsg(cmd->sock, &data_hdr,
-                       sizeof(struct lttcomm_relayd_data_hdr), MSG_WAITALL);
+                       sizeof(struct lttcomm_relayd_data_hdr), 0);
        if (ret <= 0) {
                ERR("Connections seems to be closed");
                ret = -1;
@@ -1506,7 +1526,7 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
        DBG3("Receiving data of size %u for stream id %" PRIu64 " seqnum %" PRIu64,
                data_size, stream_id, net_seq_num);
-       ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, MSG_WAITALL);
+       ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, 0);
        if (ret <= 0) {
                ret = -1;
                goto end_unlock;
@@ -1533,9 +1553,13 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
        /* Check if we need to close the FD */
        if (close_stream_check(stream)) {
+               int cret;
                struct lttng_ht_iter iter;
 
-               close(stream->fd);
+               cret = close(stream->fd);
+               if (cret < 0) {
+                       PERROR("close stream process data");
+               }
                iter.iter.node = &stream->stream_n.node;
                ret = lttng_ht_del(streams_ht, &iter);
                assert(!ret);
@@ -1742,7 +1766,7 @@ void *relay_thread_worker(void *data)
                                        if (relay_connection->type == RELAY_CONTROL) {
                                                ret = relay_connection->sock->ops->recvmsg(
                                                                relay_connection->sock, &recv_hdr,
-                                                               sizeof(struct lttcomm_relayd_hdr), MSG_WAITALL);
+                                                               sizeof(struct lttcomm_relayd_hdr), 0);
                                                /* connection closed */
                                                if (ret <= 0) {
                                                        relay_cleanup_poll_connection(&events, pollfd);