From bee7cf7546038170e69c9d52e542643f773aa6b6 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 10 Mar 2022 09:58:37 -0500 Subject: [PATCH] Fix: ring buffer event counter When compiling with -DLTTNG_RING_BUFFER_COUNT_EVENTS, the lttng-ust libringbuffer can count events (with additional overhead). This is never used or enabled by default. Fix this code so it compiles again when the define is enabled. Signed-off-by: Mathieu Desnoyers Change-Id: I3aeeff7995d66a07316cc5c535b5271536a89636 --- src/common/ringbuffer/backend_internal.h | 13 ++++--------- src/common/ringbuffer/frontend_api.h | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/common/ringbuffer/backend_internal.h b/src/common/ringbuffer/backend_internal.h index 9ce9d140..bd422177 100644 --- a/src/common/ringbuffer/backend_internal.h +++ b/src/common/ringbuffer/backend_internal.h @@ -205,7 +205,7 @@ int subbuffer_id_check_index(const struct lttng_ust_ring_buffer_config *config, static inline int lib_ring_buffer_backend_get_pages(const struct lttng_ust_ring_buffer_config *config, - struct lttng_ust_ring_buffer_ctx *ctx, + const struct lttng_ust_ring_buffer_ctx *ctx, struct lttng_ust_ring_buffer_backend_pages **backend_pages) { struct lttng_ust_ring_buffer_ctx_private *ctx_private = ctx->priv; @@ -244,7 +244,7 @@ static inline struct lttng_ust_ring_buffer_backend_pages * lib_ring_buffer_get_backend_pages_from_ctx( const struct lttng_ust_ring_buffer_config *config __attribute__((unused)), - struct lttng_ust_ring_buffer_ctx *ctx) + const struct lttng_ust_ring_buffer_ctx *ctx) { return ctx->priv->backend_pages; } @@ -256,9 +256,7 @@ struct lttng_ust_ring_buffer_backend_pages * #ifdef LTTNG_RING_BUFFER_COUNT_EVENTS static inline void subbuffer_count_record(const struct lttng_ust_ring_buffer_config *config, - const struct lttng_ust_ring_buffer_ctx *ctx, - struct lttng_ust_ring_buffer_backend *bufb, - unsigned long idx, struct lttng_ust_shm_handle *handle) + const struct lttng_ust_ring_buffer_ctx *ctx) { struct lttng_ust_ring_buffer_backend_pages *backend_pages; @@ -272,10 +270,7 @@ void subbuffer_count_record(const struct lttng_ust_ring_buffer_config *config, #else /* LTTNG_RING_BUFFER_COUNT_EVENTS */ static inline void subbuffer_count_record(const struct lttng_ust_ring_buffer_config *config __attribute__((unused)), - const struct lttng_ust_ring_buffer_ctx *ctx __attribute__((unused)), - struct lttng_ust_ring_buffer_backend *bufb __attribute__((unused)), - unsigned long idx __attribute__((unused)), - struct lttng_ust_shm_handle *handle __attribute__((unused))) + const struct lttng_ust_ring_buffer_ctx *ctx __attribute__((unused))) { } #endif /* #else LTTNG_RING_BUFFER_COUNT_EVENTS */ diff --git a/src/common/ringbuffer/frontend_api.h b/src/common/ringbuffer/frontend_api.h index 879461f3..b306986e 100644 --- a/src/common/ringbuffer/frontend_api.h +++ b/src/common/ringbuffer/frontend_api.h @@ -257,7 +257,7 @@ void lib_ring_buffer_commit(const struct lttng_ust_ring_buffer_config *config, /* * Must count record before incrementing the commit count. */ - subbuffer_count_record(config, ctx, &buf->backend, endidx, handle); + subbuffer_count_record(config, ctx); /* * Order all writes to buffer before the commit count update that will -- 2.34.1