From: Jonathan Rajotte Date: Tue, 5 Feb 2019 21:58:11 +0000 (-0500) Subject: Refactor: rename lttng_consumer_rotate_channel to lttng_consumer_rotate_sample_channel X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=abf443a135ffe2dbaa4679f5b3f7bf79815ebe9c Refactor: rename lttng_consumer_rotate_channel to lttng_consumer_rotate_sample_channel lttng_consumer_rotate_channel does not perform a rotation it performs a sample of the channel. Rename it to reflect this. Signed-off-by: Jonathan Rajotte --- diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c index 3d725528a..5772b9127 100644 --- a/src/common/consumer/consumer.c +++ b/src/common/consumer/consumer.c @@ -3903,7 +3903,7 @@ end: * * Returns 0 on success, < 0 on error */ -int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel, +int lttng_consumer_rotate_sample_channel(struct lttng_consumer_channel *channel, uint64_t key, const char *path, uint64_t relayd_id, uint32_t metadata, uint64_t new_chunk_id, struct lttng_consumer_local_data *ctx) diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h index b940036f6..a90b3a385 100644 --- a/src/common/consumer/consumer.h +++ b/src/common/consumer/consumer.h @@ -834,7 +834,7 @@ void consumer_del_stream_for_data(struct lttng_consumer_stream *stream); void consumer_add_metadata_stream(struct lttng_consumer_stream *stream); void consumer_del_stream_for_metadata(struct lttng_consumer_stream *stream); int consumer_create_index_file(struct lttng_consumer_stream *stream); -int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel, +int lttng_consumer_rotate_sample_channel(struct lttng_consumer_channel *channel, uint64_t key, const char *path, uint64_t relayd_id, uint32_t metadata, uint64_t new_chunk_id, struct lttng_consumer_local_data *ctx); diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index 9bed7b55b..b2822721b 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -1093,7 +1093,7 @@ int lttng_kconsumer_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, diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index b5435c10d..7cd41cbd7 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -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,