X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=5e1ff896c4e37102bf895819717eda89aefbbba3;hb=d73bf3d793ee0b0c5b56cb47cb50c27d1789d3bd;hp=3350403d9db2ef9bd639cccf48c24f852e6f76e2;hpb=f65a74beeeb07878df549f75a65209a765892b25;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 3350403d9..5e1ff896c 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -184,6 +184,7 @@ static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
 		goto error;
 	}
 
+	consumer_stream_update_channel_attributes(stream, channel);
 	stream->chan = channel;
 
 error:
@@ -1917,6 +1918,93 @@ 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_RENAME:
+	{
+		DBG("Consumer rename session %" PRIu64 " after rotation",
+				msg.u.rotate_rename.session_id);
+		ret = lttng_consumer_rotate_rename(msg.u.rotate_rename.old_path,
+				msg.u.rotate_rename.new_path,
+				msg.u.rotate_rename.uid,
+				msg.u.rotate_rename.gid,
+				msg.u.rotate_rename.relayd_id);
+		if (ret < 0) {
+			ERR("Rotate rename failed");
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		}
+
+		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;
+		}
+		break;
+	}
+	case LTTNG_CONSUMER_MKDIR:
+	{
+		DBG("Consumer mkdir %s in session %" PRIu64,
+				msg.u.mkdir.path,
+				msg.u.mkdir.session_id);
+		ret = lttng_consumer_mkdir(msg.u.mkdir.path,
+				msg.u.mkdir.uid,
+				msg.u.mkdir.gid,
+				msg.u.mkdir.relayd_id);
+		if (ret < 0) {
+			ERR("consumer mkdir failed");
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		}
+
+		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;
+		}
+		break;
+	}
 	default:
 		break;
 	}
@@ -1997,6 +2085,15 @@ void *lttng_ustctl_get_mmap_base(struct lttng_consumer_stream *stream)
 	return ustctl_get_mmap_base(stream->ustream);
 }
 
+void lttng_ustctl_flush_buffer(struct lttng_consumer_stream *stream,
+		int producer_active)
+{
+	assert(stream);
+	assert(stream->ustream);
+
+	ustctl_flush_buffer(stream->ustream, producer_active);
+}
+
 /*
  * Take a snapshot for a specific stream.
  *