X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=c95355e9a472e35970ab7b734b18611d14bc356c;hp=219da903781a25e5af5307e24aba5347d90e30c9;hb=a4baae1b0463bc4ce65c2a458c4a941e7fabc594;hpb=8966b2b03f62a03e132f504853e9699152e9399b

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 219da9037..c95355e9a 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -176,6 +176,11 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 			DBG("Kernel consumer snapshot stream %s/%s (%" PRIu64 ")",
 					path, stream->name, stream->key);
 		}
+		ret = consumer_send_relayd_streams_sent(relayd_id);
+		if (ret < 0) {
+			ERR("sending streams sent to relayd");
+			goto end_unlock;
+		}
 
 		ret = kernctl_buffer_flush(stream->wait_fd);
 		if (ret < 0) {
@@ -751,6 +756,57 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				new_stream->name, fd, new_stream->relayd_stream_id);
 		break;
 	}
+	case LTTNG_CONSUMER_STREAMS_SENT:
+	{
+		struct lttng_consumer_channel *channel;
+
+		/*
+		 * Get stream's channel reference. Needed when adding the stream to the
+		 * global hash table.
+		 */
+		channel = consumer_find_channel(msg.u.sent_streams.channel_key);
+		if (!channel) {
+			/*
+			 * We could not find the channel. Can happen if cpu hotplug
+			 * happens while tearing down.
+			 */
+			ERR("Unable to find channel key %" PRIu64,
+					msg.u.sent_streams.channel_key);
+			ret_code = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+		}
+
+		health_code_update();
+
+		/*
+		 * Send status code to session daemon.
+		 */
+		ret = consumer_send_status_msg(sock, ret_code);
+		if (ret < 0) {
+			/* Somehow, the session daemon is not responding anymore. */
+			goto end_nosignal;
+		}
+
+		health_code_update();
+
+		/*
+		 * We should not send this message if we don't monitor the
+		 * streams in this channel.
+		 */
+		if (!channel->monitor) {
+			break;
+		}
+
+		health_code_update();
+		/* Send stream to relayd if the stream has an ID. */
+		if (msg.u.sent_streams.net_seq_idx != (uint64_t) -1ULL) {
+			ret = consumer_send_relayd_streams_sent(
+					msg.u.sent_streams.net_seq_idx);
+			if (ret < 0) {
+				goto end_nosignal;
+			}
+		}
+		break;
+	}
 	case LTTNG_CONSUMER_UPDATE_STREAM:
 	{
 		rcu_read_unlock();