extern size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb,
size_t offset, void *dest, size_t len,
- struct shm_handle *handle);
+ struct lttng_ust_shm_handle *handle);
extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
size_t offset, void *dest, size_t len,
- struct shm_handle *handle);
+ struct lttng_ust_shm_handle *handle);
/*
* Return the address where a given offset is located.
extern void *
lib_ring_buffer_offset_address(struct lib_ring_buffer_backend *bufb,
size_t offset,
- struct shm_handle *handle);
+ struct lttng_ust_shm_handle *handle);
extern void *
lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
size_t offset,
- struct shm_handle *handle);
+ struct lttng_ust_shm_handle *handle);
/**
* lib_ring_buffer_write - write data to a buffer backend
{
struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
struct channel_backend *chanb = &ctx->chan->backend;
- struct shm_handle *handle = ctx->handle;
+ struct lttng_ust_shm_handle *handle = ctx->handle;
size_t sbidx;
size_t offset = ctx->buf_offset;
struct lib_ring_buffer_backend_pages_shmp *rpages;
offset &= chanb->buf_size - 1;
sbidx = offset >> chanb->subbuf_size_order;
- id = shmp(handle, bufb->buf_wsb)[sbidx].id;
+ id = shmp_index(handle, bufb->buf_wsb, sbidx)->id;
sb_bindex = subbuffer_id_get_index(config, id);
- rpages = &shmp(handle, bufb->array)[sb_bindex];
+ rpages = shmp_index(handle, bufb->array, sb_bindex);
CHAN_WARN_ON(ctx->chan,
config->mode == RING_BUFFER_OVERWRITE
&& subbuffer_id_is_noref(config, id));
*/
CHAN_WARN_ON(chanb, offset >= chanb->buf_size);
lib_ring_buffer_do_copy(config,
- shmp(handle, shmp(handle, rpages->shmp)->p) + (offset & ~(chanb->subbuf_size - 1)),
+ shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)),
src, len);
ctx->buf_offset += len;
}
unsigned long lib_ring_buffer_get_records_unread(
const struct lib_ring_buffer_config *config,
struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+ struct lttng_ust_shm_handle *handle)
{
struct lib_ring_buffer_backend *bufb = &buf->backend;
struct lib_ring_buffer_backend_pages_shmp *pages;
unsigned int i;
for (i = 0; i < shmp(handle, bufb->chan)->backend.num_subbuf; i++) {
- id = shmp(handle, bufb->buf_wsb)[i].id;
+ id = shmp_index(handle, bufb->buf_wsb, i)->id;
sb_bindex = subbuffer_id_get_index(config, id);
- pages = &shmp(handle, bufb->array)[sb_bindex];
+ pages = shmp_index(handle, bufb->array, sb_bindex);
records_unread += v_read(config, &shmp(handle, pages->shmp)->records_unread);
}
if (config->mode == RING_BUFFER_OVERWRITE) {
id = bufb->buf_rsb.id;
sb_bindex = subbuffer_id_get_index(config, id);
- pages = &shmp(handle, bufb->array)[sb_bindex];
+ pages = shmp_index(handle, bufb->array, sb_bindex);
records_unread += v_read(config, &shmp(handle, pages->shmp)->records_unread);
}
return records_unread;