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 <mathieu.desnoyers@efficios.com>
Change-Id: I3aeeff7995d66a07316cc5c535b5271536a89636
static inline
int lib_ring_buffer_backend_get_pages(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;
struct lttng_ust_ring_buffer_backend_pages **backend_pages)
{
struct lttng_ust_ring_buffer_ctx_private *ctx_private = ctx->priv;
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_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;
}
{
return ctx->priv->backend_pages;
}
#ifdef LTTNG_RING_BUFFER_COUNT_EVENTS
static inline
void subbuffer_count_record(const struct lttng_ust_ring_buffer_config *config,
#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;
{
struct lttng_ust_ring_buffer_backend_pages *backend_pages;
#else /* LTTNG_RING_BUFFER_COUNT_EVENTS */
static inline
void subbuffer_count_record(const struct lttng_ust_ring_buffer_config *config __attribute__((unused)),
#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 */
{
}
#endif /* #else LTTNG_RING_BUFFER_COUNT_EVENTS */
/*
* Must count record before incrementing the commit count.
*/
/*
* 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
/*
* Order all writes to buffer before the commit count update that will