X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=a81a497a9f8a8fa042ba28f29bbf0e86e73dc92e;hp=791d38d91f6f05a4b154560b3a290d7e97c3d025;hb=92816cc33a1add3c8276839bd6335e17423577dd;hpb=75cfe9e675b3180eaecefac4eaed5b756f53aae8

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 791d38d91..a81a497a9 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -147,7 +147,8 @@ static struct lttng_consumer_channel *allocate_channel(uint64_t session_id,
  */
 static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
 		struct lttng_consumer_channel *channel,
-		struct lttng_consumer_local_data *ctx, int *_alloc_ret)
+		struct lttng_consumer_local_data *ctx, int *_alloc_ret,
+		uint64_t trace_archive_id)
 {
 	int alloc_ret;
 	struct lttng_consumer_stream *stream = NULL;
@@ -166,7 +167,8 @@ static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
 			cpu,
 			&alloc_ret,
 			channel->type,
-			channel->monitor);
+			channel->monitor,
+			trace_archive_id);
 	if (stream == NULL) {
 		switch (alloc_ret) {
 		case -ENOENT:
@@ -267,7 +269,8 @@ end:
  * Return 0 on success else a negative value.
  */
 static int create_ust_streams(struct lttng_consumer_channel *channel,
-		struct lttng_consumer_local_data *ctx)
+		struct lttng_consumer_local_data *ctx,
+		uint64_t trace_archive_id)
 {
 	int ret, cpu = 0;
 	struct ustctl_consumer_stream *ustream;
@@ -298,7 +301,8 @@ static int create_ust_streams(struct lttng_consumer_channel *channel,
 		}
 
 		/* Allocate consumer stream object. */
-		stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret);
+		stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret,
+				trace_archive_id);
 		if (!stream) {
 			goto error_alloc;
 		}
@@ -641,7 +645,8 @@ error:
  */
 static int ask_channel(struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_channel *channel,
-		struct ustctl_consumer_channel_attr *attr)
+		struct ustctl_consumer_channel_attr *attr,
+		uint64_t trace_archive_id)
 {
 	int ret;
 
@@ -682,7 +687,7 @@ static int ask_channel(struct lttng_consumer_local_data *ctx,
 	}
 
 	/* Open all streams for this channel. */
-	ret = create_ust_streams(channel, ctx);
+	ret = create_ust_streams(channel, ctx, trace_archive_id);
 	if (ret < 0) {
 		goto end;
 	}
@@ -986,7 +991,8 @@ end:
  * Returns 0 on success, < 0 on error
  */
 static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
-		struct lttng_consumer_local_data *ctx)
+		struct lttng_consumer_local_data *ctx,
+		uint64_t trace_archive_id)
 {
 	int ret = 0;
 	struct lttng_consumer_channel *metadata_channel;
@@ -1026,7 +1032,7 @@ static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
 	 * The metadata stream is NOT created in no monitor mode when the channel
 	 * is created on a sessiond ask channel command.
 	 */
-	ret = create_ust_streams(metadata_channel, ctx);
+	ret = create_ust_streams(metadata_channel, ctx, trace_archive_id);
 	if (ret < 0) {
 		goto error;
 	}
@@ -1081,7 +1087,8 @@ error:
  * Returns 0 on success, < 0 on error
  */
 static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
-		uint64_t nb_packets_per_stream, struct lttng_consumer_local_data *ctx)
+		uint64_t nb_packets_per_stream,
+		struct lttng_consumer_local_data *ctx)
 {
 	int ret;
 	unsigned use_relayd = 0;
@@ -1492,7 +1499,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		health_code_update();
 
-		ret = ask_channel(ctx, channel, &attr);
+		ret = ask_channel(ctx, channel, &attr,
+				msg.u.ask_channel.trace_archive_id);
 		if (ret < 0) {
 			goto end_channel_error;
 		}
@@ -1747,7 +1755,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			ret = snapshot_metadata(msg.u.snapshot_channel.key,
 					msg.u.snapshot_channel.pathname,
 					msg.u.snapshot_channel.relayd_id,
-					ctx);
+					ctx,
+					msg.u.snapshot_channel.trace_archive_id);
 			if (ret < 0) {
 				ERR("Snapshot metadata failed");
 				ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
@@ -1920,47 +1929,6 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 		goto end_msg_sessiond;
 	}
-	case LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE:
-	{
-		int channel_rotate_pipe;
-		int flags;
-
-		ret_code = LTTCOMM_CONSUMERD_SUCCESS;
-		/* Successfully received the command's type. */
-		ret = consumer_send_status_msg(sock, ret_code);
-		if (ret < 0) {
-			goto error_fatal;
-		}
-
-		ret = lttcomm_recv_fds_unix_sock(sock, &channel_rotate_pipe, 1);
-		if (ret != sizeof(channel_rotate_pipe)) {
-			ERR("Failed to receive channel rotate pipe");
-			goto error_fatal;
-		}
-
-		DBG("Received channel rotate pipe (%d)", channel_rotate_pipe);
-		ctx->channel_rotate_pipe = channel_rotate_pipe;
-		/* Set the pipe as non-blocking. */
-		ret = fcntl(channel_rotate_pipe, F_GETFL, 0);
-		if (ret == -1) {
-			PERROR("fcntl get flags of the channel rotate pipe");
-			goto error_fatal;
-		}
-		flags = ret;
-
-		ret = fcntl(channel_rotate_pipe, F_SETFL, flags | O_NONBLOCK);
-		if (ret == -1) {
-			PERROR("fcntl set O_NONBLOCK flag of the channel rotate pipe");
-			goto error_fatal;
-		}
-		DBG("Channel rotate pipe set as non-blocking");
-		ret_code = LTTCOMM_CONSUMERD_SUCCESS;
-		ret = consumer_send_status_msg(sock, ret_code);
-		if (ret < 0) {
-			goto error_fatal;
-		}
-		break;
-	}
 	case LTTNG_CONSUMER_ROTATE_CHANNEL:
 	{
 		/*
@@ -1996,7 +1964,6 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.rotate_channel.key, ctx);
 		if (ret < 0) {
 			ERR("Rotate channel failed");
-			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 		}
 		break;
 	}
@@ -2023,19 +1990,21 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 		break;
 	}
-	case LTTNG_CONSUMER_ROTATE_PENDING_RELAY:
+	case LTTNG_CONSUMER_CHECK_ROTATION_PENDING_LOCAL:
 	{
-		uint32_t pending;
-
-		DBG("Consumer rotate pending on relay for session %" PRIu64,
-				msg.u.rotate_pending_relay.session_id);
-		pending = lttng_consumer_rotate_pending_relay(
-				msg.u.rotate_pending_relay.session_id,
-				msg.u.rotate_pending_relay.relayd_id,
-				msg.u.rotate_pending_relay.chunk_id);
+		int pending;
+		uint32_t pending_reply;
+
+		DBG("Perform local check of pending rotation for session id %" PRIu64,
+				msg.u.check_rotation_pending_local.session_id);
+		pending = lttng_consumer_check_rotation_pending_local(
+				msg.u.check_rotation_pending_local.session_id,
+				msg.u.check_rotation_pending_local.chunk_id);
 		if (pending < 0) {
-			ERR("Rotate pending relay failed");
-			ret_code = LTTCOMM_CONSUMERD_RELAYD_FAIL;
+			ERR("Local rotation pending check failed with code %i", pending);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		} else {
+			pending_reply = !!pending;
 		}
 
 		health_code_update();
@@ -2046,10 +2015,64 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
+		if (pending < 0) {
+			/*
+			 * An error occured while running the command;
+			 * don't send the 'pending' flag as the sessiond
+			 * will not read it.
+			 */
+			break;
+		}
+
+		/* Send back returned value to session daemon */
+		ret = lttcomm_send_unix_sock(sock, &pending_reply,
+				sizeof(pending_reply));
+		if (ret < 0) {
+			PERROR("Failed to send rotation pending return code");
+			goto error_fatal;
+		}
+		break;
+	}
+	case LTTNG_CONSUMER_CHECK_ROTATION_PENDING_RELAY:
+	{
+		int pending;
+		uint32_t pending_reply;
+
+		DBG("Perform relayd check of pending rotation for session id %" PRIu64,
+				msg.u.check_rotation_pending_relay.session_id);
+		pending = lttng_consumer_check_rotation_pending_relay(
+				msg.u.check_rotation_pending_relay.session_id,
+				msg.u.check_rotation_pending_relay.relayd_id,
+				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;
+		} else {
+			pending_reply = !!pending;
+		}
+
+		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;
+		}
+
+		if (pending < 0) {
+			/*
+			 * An error occured while running the command;
+			 * don't send the 'pending' flag as the sessiond
+			 * will not read it.
+			 */
+			break;
+		}
+
 		/* Send back returned value to session daemon */
-		ret = lttcomm_send_unix_sock(sock, &pending, sizeof(pending));
+		ret = lttcomm_send_unix_sock(sock, &pending_reply,
+				sizeof(pending_reply));
 		if (ret < 0) {
-			PERROR("send data pending ret code");
+			PERROR("Failed to send rotation pending return code");
 			goto error_fatal;
 		}
 		break;
@@ -3118,7 +3141,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 	request.key = channel->key;
 
 	DBG("Sending metadata request to sessiond, session id %" PRIu64
-			", per-pid %" PRIu64 ", app UID %u and channek key %" PRIu64,
+			", per-pid %" PRIu64 ", app UID %u and channel key %" PRIu64,
 			request.session_id, request.session_id_per_pid, request.uid,
 			request.key);