X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=4bd9d80abc5655283435fa34473ddbb0215eda5b;hp=5a6c1d5cf1b44970b611726157460e4be50513de;hb=d1ba29d290281cf72ca3ec7b0222b336c747e925;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 5a6c1d5cf..4bd9d80ab 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -93,7 +93,8 @@ error:
  *
  * Return 0 on success else a negative value on error.
  */
-int consumer_socket_send(struct consumer_socket *socket, void *msg, size_t len)
+int consumer_socket_send(
+		struct consumer_socket *socket, const void *msg, size_t len)
 {
 	int fd;
 	ssize_t size;
@@ -861,7 +862,7 @@ error:
  * The consumer socket lock must be held by the caller.
  */
 int consumer_send_msg(struct consumer_socket *sock,
-		struct lttcomm_consumer_msg *msg)
+		const struct lttcomm_consumer_msg *msg)
 {
 	int ret;
 
@@ -913,6 +914,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		unsigned int switch_timer_interval,
 		unsigned int read_timer_interval,
 		unsigned int live_timer_interval,
+		bool is_in_live_session,
 		unsigned int monitor_timer_interval,
 		int output,
 		int type,
@@ -936,19 +938,19 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 {
 	assert(msg);
 
-        /* Zeroed structure */
+	/* Zeroed structure */
 	memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
 	msg->u.ask_channel.buffer_credentials.uid = UINT32_MAX;
 	msg->u.ask_channel.buffer_credentials.gid = UINT32_MAX;
 
-        if (trace_chunk) {
+	if (trace_chunk) {
 		uint64_t chunk_id;
 		enum lttng_trace_chunk_status chunk_status;
 
 		chunk_status = lttng_trace_chunk_get_id(trace_chunk, &chunk_id);
 		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 		LTTNG_OPTIONAL_SET(&msg->u.ask_channel.chunk_id, chunk_id);
-        }
+	}
 	msg->u.ask_channel.buffer_credentials.uid = buffer_credentials->uid;
 	msg->u.ask_channel.buffer_credentials.gid = buffer_credentials->gid;
 
@@ -959,6 +961,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.ask_channel.switch_timer_interval = switch_timer_interval;
 	msg->u.ask_channel.read_timer_interval = read_timer_interval;
 	msg->u.ask_channel.live_timer_interval = live_timer_interval;
+	msg->u.ask_channel.is_live = is_in_live_session;
 	msg->u.ask_channel.monitor_timer_interval = monitor_timer_interval;
 	msg->u.ask_channel.output = output;
 	msg->u.ask_channel.type = type;
@@ -1014,6 +1017,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t tracefile_count,
 		unsigned int monitor,
 		unsigned int live_timer_interval,
+		bool is_in_live_session,
 		unsigned int monitor_timer_interval,
 		struct lttng_trace_chunk *trace_chunk)
 {
@@ -1022,14 +1026,14 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	/* Zeroed structure */
 	memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
 
-        if (trace_chunk) {
+	if (trace_chunk) {
 		uint64_t chunk_id;
 		enum lttng_trace_chunk_status chunk_status;
 
 		chunk_status = lttng_trace_chunk_get_id(trace_chunk, &chunk_id);
 		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 		LTTNG_OPTIONAL_SET(&msg->u.channel.chunk_id, chunk_id);
-        }
+	}
 
 	/* Send channel */
 	msg->cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
@@ -1043,6 +1047,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.channel.tracefile_count = tracefile_count;
 	msg->u.channel.monitor = monitor;
 	msg->u.channel.live_timer_interval = live_timer_interval;
+	msg->u.channel.is_live = is_in_live_session;
 	msg->u.channel.monitor_timer_interval = monitor_timer_interval;
 
 	strncpy(msg->u.channel.pathname, pathname,
@@ -1717,6 +1722,32 @@ error:
 	return ret;
 }
 
+int consumer_open_channel_packets(struct consumer_socket *socket, uint64_t key)
+{
+	int ret;
+	const struct lttcomm_consumer_msg msg = {
+		.cmd_type = LTTNG_CONSUMER_OPEN_CHANNEL_PACKETS,
+		.u.open_channel_packets.key = key,
+	};
+
+	assert(socket);
+
+	DBG("Consumer open channel packets: channel key = %" PRIu64, key);
+
+	health_code_update();
+
+	pthread_mutex_lock(socket->lock);
+	ret = consumer_send_msg(socket, &msg);
+	pthread_mutex_unlock(socket->lock);
+	if (ret < 0) {
+		goto error_socket;
+	}
+
+error_socket:
+	health_code_update();
+	return ret;
+}
+
 int consumer_clear_channel(struct consumer_socket *socket, uint64_t key)
 {
 	int ret;
@@ -1792,6 +1823,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 	char creation_timestamp_buffer[ISO8601_STR_LEN];
 	const char *creation_timestamp_str = "(none)";
 	const bool chunk_has_local_output = relayd_id == -1ULL;
+	enum lttng_trace_chunk_status tc_status;
 	struct lttcomm_consumer_msg msg = {
 		.cmd_type = LTTNG_CONSUMER_CREATE_TRACE_CHUNK,
 		.u.create_trace_chunk.session_id = session_id,
@@ -1869,12 +1901,9 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 			ret = -LTTNG_ERR_FATAL;
 			goto error;
 		}
-		ret = lttng_directory_handle_create_subdirectory_as_user(
-				chunk_directory_handle,
-				domain_subdir,
-				S_IRWXU | S_IRWXG,
-				&chunk_credentials);
-		if (ret) {
+		tc_status = lttng_trace_chunk_create_subdirectory(
+				chunk, domain_subdir);
+		if (tc_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			PERROR("Failed to create chunk domain output directory \"%s\"",
 				domain_subdir);
 			ret = -LTTNG_ERR_FATAL;