X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=4a7efad3ec28dcbea09a6a070b9f9aef5a16dbef;hp=83b2143d727ca5aab4790d665ba229912a1501d6;hb=f75c5439a7fe3d47edf68098f249421b701fceaf;hpb=d295668767ac8234e83984e1812d342d03293d88

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 83b2143d7..4a7efad3e 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -519,7 +519,8 @@ error_open:
 	if (channel->root_shm_path[0]) {
 		(void) run_as_rmdir_recursive(channel->root_shm_path,
 				channel->buffer_credentials.value.uid,
-				channel->buffer_credentials.value.gid);
+				channel->buffer_credentials.value.gid,
+				LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	}
 	free(stream_fds);
 error_alloc:
@@ -2008,8 +2009,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	case LTTNG_CONSUMER_CREATE_TRACE_CHUNK:
 	{
 		const struct lttng_credentials credentials = {
-			.uid = msg.u.create_trace_chunk.credentials.uid,
-			.gid = msg.u.create_trace_chunk.credentials.gid,
+			.uid = msg.u.create_trace_chunk.credentials.value.uid,
+			.gid = msg.u.create_trace_chunk.credentials.value.gid,
 		};
 		const bool is_local_trace =
 				!msg.u.create_trace_chunk.relayd_id.is_set;
@@ -2062,9 +2063,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				!is_local_trace ? &relayd_id : NULL,
 				msg.u.create_trace_chunk.session_id,
 				msg.u.create_trace_chunk.chunk_id,
-				(time_t) msg.u.create_trace_chunk.creation_timestamp,
+				(time_t) msg.u.create_trace_chunk
+						.creation_timestamp,
 				chunk_override_name,
-				&credentials,
+				msg.u.create_trace_chunk.credentials.is_set ?
+						&credentials :
+						NULL,
 				chunk_directory_handle.is_set ?
 						&chunk_directory_handle.value :
 						NULL);
@@ -2077,15 +2081,21 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_CLOSE_TRACE_CHUNK:
 	{
+		enum lttng_trace_chunk_command_type close_command =
+				msg.u.close_trace_chunk.close_command.value;
 		const uint64_t relayd_id =
 				msg.u.close_trace_chunk.relayd_id.value;
 
 		ret_code = lttng_consumer_close_trace_chunk(
 				msg.u.close_trace_chunk.relayd_id.is_set ?
-						&relayd_id : NULL,
+						&relayd_id :
+						NULL,
 				msg.u.close_trace_chunk.session_id,
 				msg.u.close_trace_chunk.chunk_id,
-				(time_t) msg.u.close_trace_chunk.close_timestamp);
+				(time_t) msg.u.close_trace_chunk.close_timestamp,
+				msg.u.close_trace_chunk.close_command.is_set ?
+						&close_command :
+						NULL);
 		goto end_msg_sessiond;
 	}
 	case LTTNG_CONSUMER_TRACE_CHUNK_EXISTS:
@@ -2340,7 +2350,8 @@ void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan)
 	if (chan->root_shm_path[0]) {
 		(void) run_as_rmdir_recursive(chan->root_shm_path,
 				chan->buffer_credentials.value.uid,
-				chan->buffer_credentials.value.gid);
+				chan->buffer_credentials.value.gid,
+				LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	}
 	free(chan->stream_fds);
 }
@@ -2513,6 +2524,13 @@ int commit_one_metadata_packet(struct lttng_consumer_stream *stream)
 			stream->ust_metadata_pushed);
 	ret = write_len;
 
+	/*
+	 * Switch packet (but don't open the next one) on every commit of
+	 * a metadata packet. Since the subbuffer is fully filled (with padding,
+	 * if needed), the stream is "quiescent" after this commit.
+	 */
+	ustctl_flush_buffer(stream->ustream, 1);
+	stream->quiescent = true;
 end:
 	pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
 	return ret;
@@ -2557,7 +2575,6 @@ int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx,
 		retry = 1;
 	}
 
-	ustctl_flush_buffer(metadata->ustream, 1);
 	ret = ustctl_snapshot(metadata->ustream);
 	if (ret < 0) {
 		if (errno != EAGAIN) {
@@ -2761,7 +2778,6 @@ retry:
 			if (ret <= 0) {
 				goto error;
 			}
-			ustctl_flush_buffer(stream->ustream, 1);
 			goto retry;
 		}