X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=0b0b8af56de69c029f8ba419a1d0e190d09004e6;hp=73d27b57b04effa5ad3307576e3b1461be63699c;hb=749a5b3f83da6d2859d3ac964ec38342870d1e0f;hpb=3eb928aad0c1f249830d16d6744a5a23b145a26c

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 73d27b57b..0b0b8af56 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -765,7 +765,7 @@ static int flush_channel(uint64_t chan_key)
 
 		pthread_mutex_lock(&stream->lock);
 		if (!stream->quiescent) {
-			ustctl_flush_buffer(stream->ustream, 0);
+			lttng_ustconsumer_flush_buffer(stream, 0);
 			stream->quiescent = true;
 		}
 		pthread_mutex_unlock(&stream->lock);
@@ -1137,7 +1137,7 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 		 * Else, if quiescent, it has already been done by the prior stop.
 		 */
 		if (!stream->quiescent) {
-			ustctl_flush_buffer(stream->ustream, 0);
+			lttng_ustconsumer_flush_buffer(stream, 0);
 		}
 
 		ret = lttng_ustconsumer_take_snapshot(stream);
@@ -1941,7 +1941,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			 * Sample the rotate position of all the streams in
 			 * this channel.
 			 */
-			ret = lttng_consumer_rotate_channel(channel, key,
+			ret = lttng_consumer_rotate_sample_channel(channel, key,
 					msg.u.rotate_channel.pathname,
 					msg.u.rotate_channel.relayd_id,
 					msg.u.rotate_channel.metadata,
@@ -2026,7 +2026,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		if (pending < 0) {
 			/*
-			 * An error occured while running the command;
+			 * An error occurred while running the command;
 			 * don't send the 'pending' flag as the sessiond
 			 * will not read it.
 			 */
@@ -2070,7 +2070,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		if (pending < 0) {
 			/*
-			 * An error occured while running the command;
+			 * An error occurred while running the command;
 			 * don't send the 'pending' flag as the sessiond
 			 * will not read it.
 			 */
@@ -2109,6 +2109,31 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 		break;
 	}
+	case LTTNG_CONSUMER_CLEAR_CHANNEL:
+	{
+		struct lttng_consumer_channel *channel;
+		uint64_t key = msg.u.clear_channel.key;
+
+		channel = consumer_find_channel(key);
+		if (!channel) {
+			DBG("Channel %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+		} else {
+			ret = lttng_consumer_clear_channel(channel);
+			if (ret) {
+				ERR("Clear channel failed key %" PRIu64, key);
+				ret_code = ret;
+			}
+
+			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;
 	}
@@ -2189,15 +2214,6 @@ 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.
  *
@@ -2264,6 +2280,14 @@ void lttng_ustconsumer_flush_buffer(struct lttng_consumer_stream *stream,
 	ustctl_flush_buffer(stream->ustream, producer);
 }
 
+void lttng_ustconsumer_clear_buffer(struct lttng_consumer_stream *stream)
+{
+	assert(stream);
+	assert(stream->ustream);
+
+	ustctl_clear_buffer(stream->ustream);
+}
+
 int lttng_ustconsumer_get_current_timestamp(
 		struct lttng_consumer_stream *stream, uint64_t *ts)
 {
@@ -2294,7 +2318,7 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
 
 	pthread_mutex_lock(&stream->lock);
 	if (!stream->quiescent) {
-		ustctl_flush_buffer(stream->ustream, 0);
+		lttng_ustconsumer_flush_buffer(stream, 0);
 		stream->quiescent = true;
 	}
 	pthread_mutex_unlock(&stream->lock);
@@ -2560,7 +2584,7 @@ int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx,
 		retry = 1;
 	}
 
-	ustctl_flush_buffer(metadata->ustream, 1);
+	lttng_ustconsumer_flush_buffer(metadata, 1);
 	ret = ustctl_snapshot(metadata->ustream);
 	if (ret < 0) {
 		if (errno != EAGAIN) {
@@ -2764,7 +2788,7 @@ retry:
 			if (ret <= 0) {
 				goto error;
 			}
-			ustctl_flush_buffer(stream->ustream, 1);
+			lttng_ustconsumer_flush_buffer(stream, 1);
 			goto retry;
 		}