X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=ab4f604d7a5c525447cdf23453633ef0baa4318a;hb=84382d49b1e8a17037d0415d84f1c9e250163494;hp=219da903781a25e5af5307e24aba5347d90e30c9;hpb=50adc26400482c07210afcda8ef1d3322f75871d;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 219da9037..ab4f604d7 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -176,6 +176,13 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
 			DBG("Kernel consumer snapshot stream %s/%s (%" PRIu64 ")",
 					path, stream->name, stream->key);
 		}
+		if (relayd_id != -1ULL) {
+			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) {
@@ -434,17 +441,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 	health_code_update();
 
-	if (msg.cmd_type == LTTNG_CONSUMER_STOP) {
-		/*
-		 * Notify the session daemon that the command is completed.
-		 *
-		 * On transport layer error, the function call will print an error
-		 * message so handling the returned code is a bit useless since we
-		 * return an error code anyway.
-		 */
-		(void) consumer_send_status_msg(sock, ret_code);
-		return -ENOENT;
-	}
+	/* Deprecated command */
+	assert(msg.cmd_type != LTTNG_CONSUMER_STOP);
 
 	health_code_update();
 
@@ -586,9 +584,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		health_poll_entry();
 		ret = lttng_consumer_poll_socket(consumer_sockpoll);
 		health_poll_exit();
-		if (ret < 0) {
-			rcu_read_unlock();
-			return -EINTR;
+		if (ret) {
+			goto error_fatal;
 		}
 
 		health_code_update();
@@ -751,6 +748,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();
@@ -1096,9 +1144,10 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 				(ret != len && stream->net_seq_idx == (uint64_t) -1ULL)) {
 			/*
 			 * Display the error but continue processing to try to release the
-			 * subbuffer
+			 * subbuffer. This is a DBG statement since this is possible to
+			 * happen without being a critical error.
 			 */
-			ERR("Error writing to tracefile "
+			DBG("Error writing to tracefile "
 					"(ret: %zd != len: %lu != subbuf_size: %lu)",
 					ret, len, subbuf_size);
 			write_index = 0;