Clean-up: rename double 'lttng' prefixed functions

Rename `lttng_lttng_ust_ctl_flush_buffer` to `lttng_ust_flush_buffer`
since the double prefix is odd, but needed to work-around a clash
with symbols introduced in liblttng-ust-ctl as part of 2.13.

Two functions stubs are not used are removed:
  - lttng_lttng_ust_ctl_get_mmap_read_offset,
  - lttng_lttng_ust_ctl_get_mmap_base.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I9a924f503c7d409ed1a28768d07cbbad9d23f503

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 429ab14b1d728a0f15e09872c1763c9c76e0dde4..87ca3192775a2b4c4bedaee75e0ef661ca6e6b11 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2314,8 +2314,8 @@ end:
        return ret_func;
 }
 
-void lttng_lttng_ust_ctl_flush_buffer(struct lttng_consumer_stream *stream,
-               int producer_active)
+void lttng_ust_flush_buffer(
+               struct lttng_consumer_stream *stream, int producer_active)
 {
        assert(stream);
        assert(stream->ustream);

diff --git a/src/common/ust-consumer/ust-consumer.h b/src/common/ust-consumer/ust-consumer.h
index 31a734c777931eb2ed92f9a55439da1cfbabf122..7ddcb112affb34b1a1234f54a0f0eb2457883751 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.h
+++ b/src/common/ust-consumer/ust-consumer.h
@@ -39,10 +39,10 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream);
 
 void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream);
 
-void lttng_lttng_ust_ctl_flush_buffer(struct lttng_consumer_stream *stream,
-               int producer_active);
-int lttng_ustconsumer_get_stream_id(struct lttng_consumer_stream *stream,
-               uint64_t *stream_id);
+void lttng_ust_flush_buffer(
+               struct lttng_consumer_stream *stream, int producer_active);
+int lttng_ustconsumer_get_stream_id(
+               struct lttng_consumer_stream *stream, uint64_t *stream_id);
 int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream);
 void lttng_ustconsumer_close_all_metadata(struct lttng_ht *ht);
 void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata);
@@ -162,24 +162,13 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
 {
 }
 
-static inline
-int lttng_lttng_ust_ctl_get_mmap_read_offset(struct lttng_consumer_stream *stream,
-               unsigned long *off)
-{
-       return -ENOSYS;
-}
 static inline
 int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 {
        return -ENOSYS;
 }
 static inline
-void *lttng_lttng_ust_ctl_get_mmap_base(struct lttng_consumer_stream *stream)
-{
-       return NULL;
-}
-static inline
-void lttng_lttng_ust_ctl_flush_buffer(struct lttng_consumer_stream *stream,
+void lttng_ust_flush_buffer(struct lttng_consumer_stream *stream,
                int producer_active)
 {
 }