X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=b2822721bf6001f87a1845a1dea6bb2dcb81dfd4;hp=c223fa395af172525985e92bdaf8b39058647f6d;hb=abf443a135ffe2dbaa4679f5b3f7bf79815ebe9c;hpb=92816cc33a1add3c8276839bd6335e17423577dd

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index c223fa395..b2822721b 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -124,28 +124,22 @@ int lttng_kconsumer_get_consumed_snapshot(struct lttng_consumer_stream *stream,
 
 /*
  * Take a snapshot of all the stream of a channel
+ * RCU read-side lock must be held across this function to ensure existence of
+ * channel.
  *
  * Returns 0 on success, < 0 on error
  */
-int lttng_kconsumer_snapshot_channel(uint64_t key, char *path,
-		uint64_t relayd_id, uint64_t nb_packets_per_stream,
+int lttng_kconsumer_snapshot_channel(struct lttng_consumer_channel *channel,
+		uint64_t key, char *path, uint64_t relayd_id, uint64_t nb_packets_per_stream,
 		struct lttng_consumer_local_data *ctx)
 {
 	int ret;
-	struct lttng_consumer_channel *channel;
 	struct lttng_consumer_stream *stream;
 
 	DBG("Kernel consumer snapshot channel %" PRIu64, key);
 
 	rcu_read_lock();
 
-	channel = consumer_find_channel(key);
-	if (!channel) {
-		ERR("No channel found for key %" PRIu64, key);
-		ret = -1;
-		goto end;
-	}
-
 	/* Splice is not supported yet for channel snapshot. */
 	if (channel->output != CONSUMER_CHANNEL_MMAP) {
 		ERR("Unsupported output %d", channel->output);
@@ -333,15 +327,17 @@ end:
 
 /*
  * Read the whole metadata available for a snapshot.
+ * RCU read-side lock must be held across this function to ensure existence of
+ * metadata_channel.
  *
  * Returns 0 on success, < 0 on error
  */
-static int lttng_kconsumer_snapshot_metadata(uint64_t key, char *path,
-		uint64_t relayd_id, struct lttng_consumer_local_data *ctx)
+static int lttng_kconsumer_snapshot_metadata(struct lttng_consumer_channel *metadata_channel,
+		uint64_t key, char *path, uint64_t relayd_id,
+		struct lttng_consumer_local_data *ctx)
 {
 	int ret, use_relayd = 0;
 	ssize_t ret_read;
-	struct lttng_consumer_channel *metadata_channel;
 	struct lttng_consumer_stream *metadata_stream;
 
 	assert(ctx);
@@ -351,13 +347,6 @@ static int lttng_kconsumer_snapshot_metadata(uint64_t key, char *path,
 
 	rcu_read_lock();
 
-	metadata_channel = consumer_find_channel(key);
-	if (!metadata_channel) {
-		ERR("Kernel snapshot metadata not found for key %" PRIu64, key);
-		ret = -1;
-		goto error_no_channel;
-	}
-
 	metadata_stream = metadata_channel->metadata_stream;
 	assert(metadata_stream);
 	pthread_mutex_lock(&metadata_stream->lock);
@@ -422,7 +411,6 @@ error_snapshot:
 	cds_list_del(&metadata_stream->send_node);
 	consumer_stream_destroy(metadata_stream, NULL);
 	metadata_channel->metadata_stream = NULL;
-error_no_channel:
 	rcu_read_unlock();
 	return ret;
 }
@@ -900,26 +888,34 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_SNAPSHOT_CHANNEL:
 	{
-		if (msg.u.snapshot_channel.metadata == 1) {
-			ret = lttng_kconsumer_snapshot_metadata(msg.u.snapshot_channel.key,
-					msg.u.snapshot_channel.pathname,
-					msg.u.snapshot_channel.relayd_id, ctx);
-			if (ret < 0) {
-				ERR("Snapshot metadata failed");
-				ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
-			}
+		struct lttng_consumer_channel *channel;
+		uint64_t key = msg.u.snapshot_channel.key;
+
+		channel = consumer_find_channel(key);
+		if (!channel) {
+			ERR("Channel %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 		} else {
-			ret = lttng_kconsumer_snapshot_channel(msg.u.snapshot_channel.key,
-					msg.u.snapshot_channel.pathname,
-					msg.u.snapshot_channel.relayd_id,
-					msg.u.snapshot_channel.nb_packets_per_stream,
-					ctx);
-			if (ret < 0) {
-				ERR("Snapshot channel failed");
-				ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			if (msg.u.snapshot_channel.metadata == 1) {
+				ret = lttng_kconsumer_snapshot_metadata(channel, key,
+						msg.u.snapshot_channel.pathname,
+						msg.u.snapshot_channel.relayd_id, ctx);
+				if (ret < 0) {
+					ERR("Snapshot metadata failed");
+					ret_code = LTTCOMM_CONSUMERD_SNAPSHOT_FAILED;
+				}
+			} else {
+				ret = lttng_kconsumer_snapshot_channel(channel, key,
+						msg.u.snapshot_channel.pathname,
+						msg.u.snapshot_channel.relayd_id,
+						msg.u.snapshot_channel.nb_packets_per_stream,
+						ctx);
+				if (ret < 0) {
+					ERR("Snapshot channel failed");
+					ret_code = LTTCOMM_CONSUMERD_SNAPSHOT_FAILED;
+				}
 			}
 		}
-
 		health_code_update();
 
 		ret = consumer_send_status_msg(sock, ret_code);
@@ -1084,35 +1080,44 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_ROTATE_CHANNEL:
 	{
-		DBG("Consumer rotate channel %" PRIu64, msg.u.rotate_channel.key);
+		struct lttng_consumer_channel *channel;
+		uint64_t key = msg.u.rotate_channel.key;
 
-		/*
-		 * Sample the rotate position of all the streams in this channel.
-		 */
-		ret = lttng_consumer_rotate_channel(msg.u.rotate_channel.key,
-				msg.u.rotate_channel.pathname,
-				msg.u.rotate_channel.relayd_id,
-				msg.u.rotate_channel.metadata,
-				msg.u.rotate_channel.new_chunk_id,
-				ctx);
-		if (ret < 0) {
-			ERR("Rotate channel failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
-		}
+		DBG("Consumer rotate channel %" PRIu64, key);
 
-		health_code_update();
+		channel = consumer_find_channel(key);
+		if (!channel) {
+			ERR("Channel %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		} else {
+			/*
+			 * Sample the rotate position of all the streams in this channel.
+			 */
+			ret = lttng_consumer_rotate_sample_channel(channel, key,
+					msg.u.rotate_channel.pathname,
+					msg.u.rotate_channel.relayd_id,
+					msg.u.rotate_channel.metadata,
+					msg.u.rotate_channel.new_chunk_id,
+					ctx);
+			if (ret < 0) {
+				ERR("Rotate channel failed");
+				ret_code = LTTCOMM_CONSUMERD_ROTATION_FAIL;
+			}
 
+			health_code_update();
+		}
 		ret = consumer_send_status_msg(sock, ret_code);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
 			goto end_nosignal;
 		}
-
-		/* Rotate the streams that are ready right now. */
-		ret = lttng_consumer_rotate_ready_streams(
-				msg.u.rotate_channel.key, ctx);
-		if (ret < 0) {
-			ERR("Rotate ready streams failed");
+		if (channel) {
+			/* Rotate the streams that are ready right now. */
+			ret = lttng_consumer_rotate_ready_streams(
+					channel, key, ctx);
+			if (ret < 0) {
+				ERR("Rotate ready streams failed");
+			}
 		}
 
 		break;
@@ -1130,7 +1135,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.rotate_rename.relayd_id);
 		if (ret < 0) {
 			ERR("Rotate rename failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATE_RENAME_FAILED;
 		}
 
 		health_code_update();
@@ -1154,7 +1159,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.check_rotation_pending_local.chunk_id);
 		if (pending < 0) {
 			ERR("Local rotation pending check failed with code %i", pending);
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_LOCAL_FAILED;
 		} else {
 			pending_reply = !!pending;
 		}
@@ -1169,7 +1174,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		if (pending < 0) {
 			/*
-			 * An error occured while running the command;
+			 * An error occurred while running the command;
 			 * don't send the 'pending' flag as the sessiond
 			 * will not read it.
 			 */
@@ -1198,7 +1203,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.check_rotation_pending_relay.chunk_id);
 		if (pending < 0) {
 			ERR("Relayd rotation pending check failed with code %i", pending);
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_RELAY_FAILED;
 		} else {
 			pending_reply = !!pending;
 		}
@@ -1213,7 +1218,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		if (pending < 0) {
 			/*
-			 * An error occured while running the command;
+			 * An error occurred while running the command;
 			 * don't send the 'pending' flag as the sessiond
 			 * will not read it.
 			 */
@@ -1240,7 +1245,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.mkdir.relayd_id);
 		if (ret < 0) {
 			ERR("consumer mkdir failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_MKDIR_FAILED;
 		}
 
 		health_code_update();