Fix: don't do custom lookup to relayd stream ht

[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 0446d9cb04dcddce51d919ca6d0e27160ed25bdc..66273107c354c5b541b372cb8725a6ad732c5ea4 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -254,7 +254,7 @@ int notify_thread_pipe(int wpipe)
        do {
                ret = write(wpipe, "!", 1);
        } while (ret < 0 && errno == EINTR);
-       if (ret < 0) {
+       if (ret < 0 || ret != 1) {
                PERROR("write poll pipe");
        }
 
@@ -669,7 +669,7 @@ void *relay_thread_dispatcher(void *data)
                                                sizeof(struct relay_command));
                        } while (ret < 0 && errno == EINTR);
                        free(relay_cmd);
-                       if (ret < 0) {
+                       if (ret < 0 || ret != sizeof(struct relay_command)) {
                                PERROR("write cmd pipe");
                                goto error;
                        }
@@ -866,6 +866,34 @@ char *create_output_path(char *path_name)
        }
 }
 
+/*
+ * Get stream from stream id.
+ * Need to be called with RCU read-side lock held.
+ */
+static
+struct relay_stream *relay_stream_from_stream_id(uint64_t stream_id,
+               struct lttng_ht *streams_ht)
+{
+       struct lttng_ht_node_ulong *node;
+       struct lttng_ht_iter iter;
+       struct relay_stream *ret;
+
+       lttng_ht_lookup(streams_ht,
+                       (void *)((unsigned long) stream_id),
+                       &iter);
+       node = lttng_ht_iter_get_node_ulong(&iter);
+       if (node == NULL) {
+               DBG("Relay stream %" PRIu64 " not found", stream_id);
+               ret = NULL;
+               goto end;
+       }
+
+       ret = caa_container_of(node, struct relay_stream, stream_n);
+
+end:
+       return ret;
+}
+
 static
 void deferred_free_stream(struct rcu_head *head)
 {
@@ -958,6 +986,7 @@ error:
        send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
        if (send_ret < 0) {
                ERR("Relayd sending session id");
+               ret = send_ret;
        }
 
        return ret;
@@ -983,7 +1012,6 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
                goto end_no_session;
        }
 
-       /* FIXME : use data_size for something ? */
        ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info,
                        sizeof(struct lttcomm_relayd_add_stream), 0);
        if (ret < sizeof(struct lttcomm_relayd_add_stream)) {
@@ -1055,6 +1083,7 @@ end:
                        sizeof(struct lttcomm_relayd_status_stream), 0);
        if (send_ret < 0) {
                ERR("Relay sending stream id");
+               ret = send_ret;
        }
        rcu_read_unlock();
 
@@ -1074,7 +1103,6 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
        struct lttcomm_relayd_generic_reply reply;
        struct relay_stream *stream;
        int ret, send_ret;
-       struct lttng_ht_node_ulong *node;
        struct lttng_ht_iter iter;
 
        DBG("Close stream received");
@@ -1099,17 +1127,8 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
        }
 
        rcu_read_lock();
-       lttng_ht_lookup(streams_ht,
-                       (void *)((unsigned long) be64toh(stream_info.stream_id)),
-                       &iter);
-       node = lttng_ht_iter_get_node_ulong(&iter);
-       if (node == NULL) {
-               DBG("Relay stream %" PRIu64 " not found", be64toh(stream_info.stream_id));
-               ret = -1;
-               goto end_unlock;
-       }
-
-       stream = caa_container_of(node, struct relay_stream, stream_n);
+       stream = relay_stream_from_stream_id(be64toh(stream_info.stream_id),
+                       streams_ht);
        if (!stream) {
                ret = -1;
                goto end_unlock;
@@ -1125,6 +1144,7 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
                if (delret < 0) {
                        PERROR("close stream");
                }
+               iter.iter.node = &stream->stream_n.node;
                delret = lttng_ht_del(streams_ht, &iter);
                assert(!delret);
                call_rcu(&stream->rcu_node,
@@ -1144,6 +1164,7 @@ end_unlock:
                        sizeof(struct lttcomm_relayd_generic_reply), 0);
        if (send_ret < 0) {
                ERR("Relay sending stream id");
+               ret = send_ret;
        }
 
 end_no_session:
@@ -1194,34 +1215,6 @@ int relay_start(struct lttcomm_relayd_hdr *recv_hdr,
        return ret;
 }
 
-/*
- * Get stream from stream id.
- * Need to be called with RCU read-side lock held.
- */
-static
-struct relay_stream *relay_stream_from_stream_id(uint64_t stream_id,
-               struct lttng_ht *streams_ht)
-{
-       struct lttng_ht_node_ulong *node;
-       struct lttng_ht_iter iter;
-       struct relay_stream *ret;
-
-       lttng_ht_lookup(streams_ht,
-                       (void *)((unsigned long) stream_id),
-                       &iter);
-       node = lttng_ht_iter_get_node_ulong(&iter);
-       if (node == NULL) {
-               DBG("Relay stream %" PRIu64 " not found", stream_id);
-               ret = NULL;
-               goto end;
-       }
-
-       ret = caa_container_of(node, struct relay_stream, stream_n);
-
-end:
-       return ret;
-}
-
 /*
  * Append padding to the file pointed by the file descriptor fd.
  */
@@ -1244,7 +1237,7 @@ static int write_padding_to_file(int fd, uint32_t size)
        do {
                ret = write(fd, zeros, size);
        } while (ret < 0 && errno == EINTR);
-       if (ret < 0) {
+       if (ret < 0 || ret != size) {
                PERROR("write padding to file");
        }
 
@@ -1322,7 +1315,7 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
                ret = write(metadata_stream->fd, metadata_struct->payload,
                                payload_size);
        } while (ret < 0 && errno == EINTR);
-       if (ret < payload_size) {
+       if (ret < 0 || ret != payload_size) {
                ERR("Relay error writing metadata on file");
                ret = -1;
                goto end_unlock;
@@ -1408,8 +1401,6 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
        struct lttcomm_relayd_generic_reply reply;
        struct relay_stream *stream;
        int ret;
-       struct lttng_ht_node_ulong *node;
-       struct lttng_ht_iter iter;
        uint64_t last_net_seq_num, stream_id;
 
        DBG("Data pending command received");
@@ -1437,17 +1428,12 @@ int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
        last_net_seq_num = be64toh(msg.last_net_seq_num);
 
        rcu_read_lock();
-       lttng_ht_lookup(streams_ht, (void *)((unsigned long) stream_id), &iter);
-       node = lttng_ht_iter_get_node_ulong(&iter);
-       if (node == NULL) {
-               DBG("Relay stream %" PRIu64 " not found", stream_id);
+       stream = relay_stream_from_stream_id(stream_id, streams_ht);
+       if (stream == NULL) {
                ret = -1;
                goto end_unlock;
        }
 
-       stream = caa_container_of(node, struct relay_stream, stream_n);
-       assert(stream);
-
        DBG("Data pending for stream id %" PRIu64 " prev_seq %" PRIu64
                        " and last_seq %" PRIu64, stream_id, stream->prev_seq,
                        last_net_seq_num);
@@ -1804,7 +1790,7 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
        do {
                ret = write(stream->fd, data_buffer, data_size);
        } while (ret < 0 && errno == EINTR);
-       if (ret < data_size) {
+       if (ret < 0 || ret != data_size) {
                ERR("Relay error writing data to file");
                ret = -1;
                goto end_unlock;