X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=2963c801d5407f14c3993552aa50cee75bcb1d51;hb=0e2d816a62eccd0d159ec254e87ff80a7e6cf1bb;hp=d81d0fc7a1da1bf0f57c3a670b216f95fdc7af68;hpb=a40a503f4218296700d791f1b79671bf3d0f1e22;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index d81d0fc7a..2963c801d 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -91,6 +91,20 @@ int consumer_quit;
 static struct lttng_ht *metadata_ht;
 static struct lttng_ht *data_ht;
 
+static const char *get_consumer_domain(void)
+{
+	switch (consumer_data.type) {
+	case LTTNG_CONSUMER_KERNEL:
+		return DEFAULT_KERNEL_TRACE_DIR;
+	case LTTNG_CONSUMER64_UST:
+		/* Fall-through. */
+	case LTTNG_CONSUMER32_UST:
+		return DEFAULT_UST_TRACE_DIR;
+	default:
+		abort();
+	}
+}
+
 /*
  * Notify a thread lttng pipe to poll back again. This usually means that some
  * global state has changed so we just send back the thread in a poll wait
@@ -816,7 +830,7 @@ int consumer_send_relayd_stream(struct lttng_consumer_stream *stream,
 		/* Add stream on the relayd */
 		pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 		ret = relayd_add_stream(&relayd->control_sock, stream->name,
-				path, &stream->relayd_stream_id,
+				get_consumer_domain(), path, &stream->relayd_stream_id,
 				stream->chan->tracefile_size,
 				stream->chan->tracefile_count,
 				stream->trace_chunk);
@@ -3940,15 +3954,23 @@ int consumer_flush_buffer(struct lttng_consumer_stream *stream, int producer_act
 
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
-		ret = kernctl_buffer_flush(stream->wait_fd);
-		if (ret < 0) {
-			ERR("Failed to flush kernel stream");
-			goto end;
+		if (producer_active) {
+			ret = kernctl_buffer_flush(stream->wait_fd);
+			if (ret < 0) {
+				ERR("Failed to flush kernel stream");
+				goto end;
+			}
+		} else {
+			ret = kernctl_buffer_flush_empty(stream->wait_fd);
+			if (ret < 0) {
+				ERR("Failed to flush kernel stream");
+				goto end;
+			}
 		}
 		break;
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
-		lttng_ustctl_flush_buffer(stream, producer_active);
+		lttng_ustconsumer_flush_buffer(stream, producer_active);
 		break;
 	default:
 		ERR("Unknown consumer_data type");
@@ -4017,14 +4039,23 @@ int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel,
 		}
 
 		/*
-		 * Active flush; has no effect if the production position
-		 * is at a packet boundary.
+		 * Do not flush an empty packet when rotating from a NULL trace
+		 * chunk. The stream has no means to output data, and the prior
+		 * rotation which rotated to NULL performed that side-effect already.
 		 */
-		ret = consumer_flush_buffer(stream, 1);
-		if (ret < 0) {
-			ERR("Failed to flush stream %" PRIu64 " during channel rotation",
-					stream->key);
-			goto end_unlock_stream;
+		if (stream->trace_chunk) {
+			/*
+			 * For metadata stream, do an active flush, which does not
+			 * produce empty packets. For data streams, empty-flush;
+			 * ensures we have at least one packet in each stream per trace
+			 * chunk, even if no data was produced.
+			 */
+			ret = consumer_flush_buffer(stream, stream->metadata_flag ? 1 : 0);
+			if (ret < 0) {
+				ERR("Failed to flush stream %" PRIu64 " during channel rotation",
+						stream->key);
+				goto end_unlock_stream;
+			}
 		}
 
 		ret = lttng_consumer_take_snapshot(stream);