#include <unistd.h>
#include <urcu/compiler.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
#include "backend_types.h"
#include "frontend_types.h"
#include "shm.h"
__attribute__((visibility("hidden")))
int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb,
- struct channel_backend *chan, int cpu,
+ struct channel_backend *chan,
+ int cpu,
struct lttng_ust_shm_handle *handle,
struct shm_object *shmobj);
struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct lttng_ust_lib_ring_buffer_backend_pages **backend_pages)
{
- struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx->buf->backend;
- struct channel_backend *chanb = &ctx->chan->backend;
- struct lttng_ust_shm_handle *handle = ctx->handle;
+ struct lttng_ust_lib_ring_buffer_ctx_private *ctx_private = ctx->priv;
+ struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx_private->buf->backend;
+ struct channel_backend *chanb = &ctx_private->chan->backend;
+ struct lttng_ust_shm_handle *handle = ctx_private->chan->handle;
size_t sbidx;
- size_t offset = ctx->buf_offset;
+ size_t offset = ctx_private->buf_offset;
struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages;
unsigned long sb_bindex, id;
rpages = shmp_index(handle, bufb->array, sb_bindex);
if (caa_unlikely(!rpages))
return -1;
- CHAN_WARN_ON(ctx->chan,
+ CHAN_WARN_ON(ctx_private->chan,
config->mode == RING_BUFFER_OVERWRITE
&& subbuffer_id_is_noref(config, id));
_backend_pages = shmp(handle, rpages->shmp);
lib_ring_buffer_get_backend_pages_from_ctx(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx)
{
- return ctx->backend_pages;
+ return ctx->priv->backend_pages;
}
/*
struct lttng_ust_shm_handle *handle)
{
unsigned long sb_bindex;
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
struct lttng_ust_lib_ring_buffer_backend_pages_shmp *pages_shmp;
struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
struct lttng_ust_shm_handle *handle)
{
struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
if (config->mode != RING_BUFFER_OVERWRITE)
return;
return -EPERM;
if (config->mode == RING_BUFFER_OVERWRITE) {
- struct channel *chan;
+ struct lttng_ust_lib_ring_buffer_channel *chan;
/*
* Exchange the target writer subbuffer with our own unused
* write len bytes to dest with c
*/
static inline
-void lib_ring_buffer_do_memset(char *dest, int c, unsigned long len)
+void lib_ring_buffer_do_memset(char *dest, char c, unsigned long len)
{
unsigned long i;