X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=6d2d9507bec59edfe56658a0c8e10efffaf8d132;hb=8ed89704969af8ce7758224fffc73b74ee0ab470;hp=3a5e6a9b4972cc7389453bea722bf4a6831fa5dc;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c index 3a5e6a9b..6d2d9507 100644 --- a/libringbuffer/ring_buffer_backend.c +++ b/libringbuffer/ring_buffer_backend.c @@ -1,16 +1,30 @@ /* * ring_buffer_backend.c * - * Copyright (C) 2005-2010 - Mathieu Desnoyers + * Copyright (C) 2005-2012 Mathieu Desnoyers * - * Dual LGPL v2.1/GPL v2 license. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; only + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _GNU_SOURCE +#include #include +#include -#include "ust/core.h" - -#include +#include +#include "vatomic.h" #include "backend.h" #include "frontend.h" #include "smp.h" @@ -25,16 +39,18 @@ * @extra_reader_sb: need extra subbuffer for reader */ static -int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config, - struct lib_ring_buffer_backend *bufb, +int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_config *config, + struct lttng_ust_lib_ring_buffer_backend *bufb, size_t size, size_t num_subbuf, int extra_reader_sb, - struct shm_header *shm_header) + struct lttng_ust_shm_handle *handle, + struct shm_object *shmobj) { - struct channel_backend *chanb = &shmp(bufb->chan)->backend; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; unsigned long subbuf_size, mmap_offset = 0; unsigned long num_subbuf_alloc; unsigned long i; + long page_size; subbuf_size = chanb->subbuf_size; num_subbuf_alloc = num_subbuf; @@ -42,43 +58,47 @@ int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config if (extra_reader_sb) num_subbuf_alloc++; - /* Align the entire buffer backend data on PAGE_SIZE */ - align_shm(shm_header, PAGE_SIZE); - set_shmp(bufb->array, zalloc_shm(shm_header, - sizeof(*bufb->array) * num_subbuf_alloc)); - if (unlikely(!shmp(bufb->array))) + page_size = sysconf(_SC_PAGE_SIZE); + if (page_size <= 0) { + goto page_size_error; + } + + align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_pages_shmp)); + set_shmp(bufb->array, zalloc_shm(shmobj, + sizeof(struct lttng_ust_lib_ring_buffer_backend_pages_shmp) * num_subbuf_alloc)); + if (caa_unlikely(!shmp(handle, bufb->array))) goto array_error; /* * This is the largest element (the buffer pages) which needs to - * be aligned on PAGE_SIZE. + * be aligned on page size. */ - align_shm(shm_header, PAGE_SIZE); - set_shmp(bufb->memory_map, zalloc_shm(shm_header, + align_shm(shmobj, page_size); + set_shmp(bufb->memory_map, zalloc_shm(shmobj, subbuf_size * num_subbuf_alloc)); - if (unlikely(!shmp(bufb->memory_map))) + if (caa_unlikely(!shmp(handle, bufb->memory_map))) goto memory_map_error; /* Allocate backend pages array elements */ for (i = 0; i < num_subbuf_alloc; i++) { - align_shm(shm_header, __alignof__(struct lib_ring_buffer_backend_pages)); - set_shmp(bufb->array[i], - zalloc_shm(shm_header, - sizeof(struct lib_ring_buffer_backend_pages))); - if (!shmp(bufb->array[i])) + align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_pages)); + set_shmp(shmp_index(handle, bufb->array, i)->shmp, + zalloc_shm(shmobj, + sizeof(struct lttng_ust_lib_ring_buffer_backend_pages))); + if (!shmp(handle, shmp_index(handle, bufb->array, i)->shmp)) goto free_array; } /* Allocate write-side subbuffer table */ - align_shm(shm_header, __alignof__(struct lib_ring_buffer_backend_subbuffer)); - bufb->buf_wsb = zalloc_shm(shm_header, - sizeof(struct lib_ring_buffer_backend_subbuffer) - * num_subbuf); - if (unlikely(!shmp(bufb->buf_wsb))) + align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_subbuffer)); + set_shmp(bufb->buf_wsb, zalloc_shm(shmobj, + sizeof(struct lttng_ust_lib_ring_buffer_backend_subbuffer) + * num_subbuf)); + if (caa_unlikely(!shmp(handle, bufb->buf_wsb))) goto free_array; for (i = 0; i < num_subbuf; i++) - shmp(bufb->buf_wsb)[i].id = subbuffer_id(config, 0, 1, i); + shmp_index(handle, bufb->buf_wsb, i)->id = subbuffer_id(config, 0, 1, i); /* Assign read-side subbuffer table */ if (extra_reader_sb) @@ -89,19 +109,19 @@ int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config /* Assign pages to page index */ for (i = 0; i < num_subbuf_alloc; i++) { - set_shmp(shmp(bufb->array)[i]->p, - &shmp(bufb->memory_map)[i * subbuf_size]); + struct shm_ref ref; + + ref.index = bufb->memory_map._ref.index; + ref.offset = bufb->memory_map._ref.offset; + ref.offset += i * subbuf_size; + + set_shmp(shmp(handle, shmp_index(handle, bufb->array, i)->shmp)->p, + ref); if (config->output == RING_BUFFER_MMAP) { - shmp(bufb->array)[i]->mmap_offset = mmap_offset; + shmp(handle, shmp_index(handle, bufb->array, i)->shmp)->mmap_offset = mmap_offset; mmap_offset += subbuf_size; } } - /* - * Align the end of each buffer backend data on PAGE_SIZE, to - * behave like an array which contains elements that need to be - * aligned on PAGE_SIZE. - */ - align_shm(shm_header, PAGE_SIZE); return 0; @@ -110,36 +130,31 @@ free_array: memory_map_error: /* bufb->array will be freed by shm teardown */ array_error: +page_size_error: return -ENOMEM; } -int lib_ring_buffer_backend_create(struct lib_ring_buffer_backend *bufb, +int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb, struct channel_backend *chanb, int cpu, - struct shm_header *shm_header) + struct lttng_ust_shm_handle *handle, + struct shm_object *shmobj) { - const struct lib_ring_buffer_config *config = chanb->config; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; - set_shmp(&bufb->chan, caa_container_of(chanb, struct channel, backend)); + set_shmp(bufb->chan, handle->chan._ref); bufb->cpu = cpu; return lib_ring_buffer_backend_allocate(config, bufb, chanb->buf_size, chanb->num_subbuf, chanb->extra_reader_sb, - shm_header); -} - -void lib_ring_buffer_backend_free(struct lib_ring_buffer_backend *bufb) -{ - /* bufb->buf_wsb will be freed by shm teardown */ - /* bufb->array[i] will be freed by shm teardown */ - /* bufb->array will be freed by shm teardown */ - bufb->allocated = 0; + handle, shmobj); } -void lib_ring_buffer_backend_reset(struct lib_ring_buffer_backend *bufb) +void lib_ring_buffer_backend_reset(struct lttng_ust_lib_ring_buffer_backend *bufb, + struct lttng_ust_shm_handle *handle) { - struct channel_backend *chanb = &shmp(bufb->chan)->backend; - const struct lib_ring_buffer_config *config = chanb->config; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; unsigned long num_subbuf_alloc; unsigned int i; @@ -148,7 +163,7 @@ void lib_ring_buffer_backend_reset(struct lib_ring_buffer_backend *bufb) num_subbuf_alloc++; for (i = 0; i < chanb->num_subbuf; i++) - shmp(bufb->buf_wsb)[i].id = subbuffer_id(config, 0, 1, i); + shmp_index(handle, bufb->buf_wsb, i)->id = subbuffer_id(config, 0, 1, i); if (chanb->extra_reader_sb) bufb->buf_rsb.id = subbuffer_id(config, 0, 1, num_subbuf_alloc - 1); @@ -157,9 +172,9 @@ void lib_ring_buffer_backend_reset(struct lib_ring_buffer_backend *bufb) for (i = 0; i < num_subbuf_alloc; i++) { /* Don't reset mmap_offset */ - v_set(config, &shmp(bufb->array)[i]->records_commit, 0); - v_set(config, &shmp(bufb->array)[i]->records_unread, 0); - shmp(bufb->array)[i]->data_size = 0; + v_set(config, &shmp(handle, shmp_index(handle, bufb->array, i)->shmp)->records_commit, 0); + v_set(config, &shmp(handle, shmp_index(handle, bufb->array, i)->shmp)->records_unread, 0); + shmp(handle, shmp_index(handle, bufb->array, i)->shmp)->data_size = 0; /* Don't reset backend page and virt addresses */ } /* Don't reset num_pages_per_subbuf, cpu, allocated */ @@ -173,7 +188,7 @@ void lib_ring_buffer_backend_reset(struct lib_ring_buffer_backend *bufb) void channel_backend_reset(struct channel_backend *chanb) { struct channel *chan = caa_container_of(chanb, struct channel, backend); - const struct lib_ring_buffer_config *config = chanb->config; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; /* * Don't reset buf_size, subbuf_size, subbuf_size_order, @@ -188,11 +203,10 @@ void channel_backend_reset(struct channel_backend *chanb) * @chanb: channel backend * @name: channel name * @config: client ring buffer configuration - * @priv: client private data * @parent: dentry of parent directory, %NULL for root directory - * @subbuf_size: size of sub-buffers (> PAGE_SIZE, power of 2) + * @subbuf_size: size of sub-buffers (> page size, power of 2) * @num_subbuf: number of sub-buffers (power of 2) - * @shm_header: shared memory header + * @lttng_ust_shm_handle: shared memory handle * * Returns channel pointer if successful, %NULL otherwise. * @@ -204,35 +218,46 @@ void channel_backend_reset(struct channel_backend *chanb) */ int channel_backend_init(struct channel_backend *chanb, const char *name, - const struct lib_ring_buffer_config *config, - void *priv, size_t subbuf_size, size_t num_subbuf, - struct shm_header *shm_header) + const struct lttng_ust_lib_ring_buffer_config *config, + size_t subbuf_size, size_t num_subbuf, + struct lttng_ust_shm_handle *handle) { struct channel *chan = caa_container_of(chanb, struct channel, backend); unsigned int i; int ret; + size_t shmsize = 0, num_subbuf_alloc; + long page_size; if (!name) return -EPERM; - if (!(subbuf_size && num_subbuf)) - return -EPERM; - + page_size = sysconf(_SC_PAGE_SIZE); + if (page_size <= 0) { + return -ENOMEM; + } /* Check that the subbuffer size is larger than a page. */ - if (subbuf_size < PAGE_SIZE) + if (subbuf_size < page_size) return -EINVAL; /* - * Make sure the number of subbuffers and subbuffer size are power of 2. + * Make sure the number of subbuffers and subbuffer size are + * power of 2, and nonzero. */ - CHAN_WARN_ON(chanb, hweight32(subbuf_size) != 1); - CHAN_WARN_ON(chanb, hweight32(num_subbuf) != 1); + if (!subbuf_size || (subbuf_size & (subbuf_size - 1))) + return -EINVAL; + if (!num_subbuf || (num_subbuf & (num_subbuf - 1))) + return -EINVAL; + /* + * Overwrite mode buffers require at least 2 subbuffers per + * buffer. + */ + if (config->mode == RING_BUFFER_OVERWRITE && num_subbuf < 2) + return -EINVAL; ret = subbuffer_id_check_index(config, num_subbuf); if (ret) return ret; - chanb->priv = priv; chanb->buf_size = num_subbuf * subbuf_size; chanb->subbuf_size = subbuf_size; chanb->buf_size_order = get_count_order(chanb->buf_size); @@ -243,41 +268,68 @@ int channel_backend_init(struct channel_backend *chanb, chanb->num_subbuf = num_subbuf; strncpy(chanb->name, name, NAME_MAX); chanb->name[NAME_MAX - 1] = '\0'; - chanb->config = config; + memcpy(&chanb->config, config, sizeof(*config)); + + /* Per-cpu buffer size: control (prior to backend) */ + shmsize = offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer)); + shmsize += sizeof(struct lttng_ust_lib_ring_buffer); + + /* Per-cpu buffer size: backend */ + /* num_subbuf + 1 is the worse case */ + num_subbuf_alloc = num_subbuf + 1; + shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_backend_pages_shmp)); + shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_pages_shmp) * num_subbuf_alloc; + shmsize += offset_align(shmsize, page_size); + shmsize += subbuf_size * num_subbuf_alloc; + shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_backend_pages)); + shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_pages) * num_subbuf_alloc; + shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_backend_subbuffer)); + shmsize += sizeof(struct lttng_ust_lib_ring_buffer_backend_subbuffer) * num_subbuf; + /* Per-cpu buffer size: control (after backend) */ + shmsize += offset_align(shmsize, __alignof__(struct commit_counters_hot)); + shmsize += sizeof(struct commit_counters_hot) * num_subbuf; + shmsize += offset_align(shmsize, __alignof__(struct commit_counters_cold)); + shmsize += sizeof(struct commit_counters_cold) * num_subbuf; if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) { - struct lib_ring_buffer *buf; - size_t alloc_size; - - /* Allocating the buffer per-cpu structures */ - align_shm(shm_header, __alignof__(struct lib_ring_buffer)); - alloc_size = sizeof(struct lib_ring_buffer); - buf = zalloc_shm(shm_header, alloc_size * num_possible_cpus()); - if (!buf) - goto end; - set_shmp(chanb->buf, buf); - + struct lttng_ust_lib_ring_buffer *buf; /* * We need to allocate for all possible cpus. */ for_each_possible_cpu(i) { - ret = lib_ring_buffer_create(&shmp(chanb->buf)[i], - chanb, i, shm_header); + struct shm_object *shmobj; + + shmobj = shm_object_table_alloc(handle->table, shmsize, + SHM_OBJECT_SHM); + if (!shmobj) + goto end; + align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer)); + set_shmp(chanb->buf[i].shmp, zalloc_shm(shmobj, sizeof(struct lttng_ust_lib_ring_buffer))); + buf = shmp(handle, chanb->buf[i].shmp); + if (!buf) + goto end; + set_shmp(buf->self, chanb->buf[i].shmp._ref); + ret = lib_ring_buffer_create(buf, chanb, i, + handle, shmobj); if (ret) goto free_bufs; /* cpu hotplug locked */ } } else { - struct lib_ring_buffer *buf; - size_t alloc_size; + struct shm_object *shmobj; + struct lttng_ust_lib_ring_buffer *buf; - align_shm(shm_header, __alignof__(struct lib_ring_buffer)); - alloc_size = sizeof(struct lib_ring_buffer); - buf = zalloc_shm(shm_header, alloc_size); + shmobj = shm_object_table_alloc(handle->table, shmsize, + SHM_OBJECT_SHM); + if (!shmobj) + goto end; + align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer)); + set_shmp(chanb->buf[0].shmp, zalloc_shm(shmobj, sizeof(struct lttng_ust_lib_ring_buffer))); + buf = shmp(handle, chanb->buf[0].shmp); if (!buf) goto end; - set_shmp(chanb->buf, buf); - ret = lib_ring_buffer_create(shmp(chanb->buf), chanb, -1, - shm_header); + set_shmp(buf->self, chanb->buf[0].shmp._ref); + ret = lib_ring_buffer_create(buf, chanb, -1, + handle, shmobj); if (ret) goto free_bufs; } @@ -286,15 +338,6 @@ int channel_backend_init(struct channel_backend *chanb, return 0; free_bufs: - if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) { - for_each_possible_cpu(i) { - struct lib_ring_buffer *buf = &shmp(chanb->buf)[i]; - - if (!buf->backend.allocated) - continue; - lib_ring_buffer_free(buf); - } - } /* We only free the buffer data upon shm teardown */ end: return -ENOMEM; @@ -306,26 +349,10 @@ end: * * Destroy all channel buffers and frees the channel. */ -void channel_backend_free(struct channel_backend *chanb) +void channel_backend_free(struct channel_backend *chanb, + struct lttng_ust_shm_handle *handle) { - const struct lib_ring_buffer_config *config = chanb->config; - unsigned int i; - - if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) { - for_each_possible_cpu(i) { - struct lib_ring_buffer *buf = &shmp(chanb->buf)[i]; - - if (!buf->backend.allocated) - continue; - lib_ring_buffer_free(buf); - } - } else { - struct lib_ring_buffer *buf = shmp(chanb->buf); - - CHAN_WARN_ON(chanb, !buf->backend.allocated); - lib_ring_buffer_free(buf); - } - /* We only free the buffer data upon shm teardown */ + /* SHM teardown takes care of everything */ } /** @@ -338,23 +365,23 @@ void channel_backend_free(struct channel_backend *chanb) * Should be protected by get_subbuf/put_subbuf. * Returns the length copied. */ -size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb, size_t offset, - void *dest, size_t len) +size_t lib_ring_buffer_read(struct lttng_ust_lib_ring_buffer_backend *bufb, size_t offset, + void *dest, size_t len, struct lttng_ust_shm_handle *handle) { - struct channel_backend *chanb = &shmp(bufb->chan)->backend; - const struct lib_ring_buffer_config *config = chanb->config; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; ssize_t orig_len; - struct lib_ring_buffer_backend_pages *rpages; + struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages; unsigned long sb_bindex, id; orig_len = len; offset &= chanb->buf_size - 1; - if (unlikely(!len)) + if (caa_unlikely(!len)) return 0; id = bufb->buf_rsb.id; sb_bindex = subbuffer_id_get_index(config, id); - rpages = shmp(bufb->array)[sb_bindex]; + rpages = shmp_index(handle, bufb->array, sb_bindex); /* * Underlying layer should never ask for reads across * subbuffers. @@ -362,7 +389,7 @@ size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb, size_t offset, CHAN_WARN_ON(chanb, offset >= chanb->buf_size); CHAN_WARN_ON(chanb, config->mode == RING_BUFFER_OVERWRITE && subbuffer_id_is_noref(config, id)); - memcpy(dest, shmp(rpages->p) + (offset & ~(chanb->subbuf_size - 1)), len); + memcpy(dest, shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)), len); return orig_len; } @@ -373,24 +400,27 @@ size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb, size_t offset, * @dest : destination address * @len : destination's length * - * return string's length + * Return string's length, or -EINVAL on error. * Should be protected by get_subbuf/put_subbuf. + * Destination length should be at least 1 to hold '\0'. */ -int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb, size_t offset, - void *dest, size_t len) +int lib_ring_buffer_read_cstr(struct lttng_ust_lib_ring_buffer_backend *bufb, size_t offset, + void *dest, size_t len, struct lttng_ust_shm_handle *handle) { - struct channel_backend *chanb = &shmp(bufb->chan)->backend; - const struct lib_ring_buffer_config *config = chanb->config; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; ssize_t string_len, orig_offset; char *str; - struct lib_ring_buffer_backend_pages *rpages; + struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages; unsigned long sb_bindex, id; + if (caa_unlikely(!len)) + return -EINVAL; offset &= chanb->buf_size - 1; orig_offset = offset; id = bufb->buf_rsb.id; sb_bindex = subbuffer_id_get_index(config, id); - rpages = shmp(bufb->array)[sb_bindex]; + rpages = shmp_index(handle, bufb->array, sb_bindex); /* * Underlying layer should never ask for reads across * subbuffers. @@ -398,7 +428,7 @@ int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb, size_t offse CHAN_WARN_ON(chanb, offset >= chanb->buf_size); CHAN_WARN_ON(chanb, config->mode == RING_BUFFER_OVERWRITE && subbuffer_id_is_noref(config, id)); - str = (char *)shmp(rpages->p) + (offset & ~(chanb->subbuf_size - 1)); + str = shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)); string_len = strnlen(str, len); if (dest && len) { memcpy(dest, str, string_len); @@ -414,24 +444,26 @@ int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb, size_t offse * * Return the address where a given offset is located (for read). * Should be used to get the current subbuffer header pointer. Given we know - * it's never on a page boundary, it's safe to write directly to this address, - * as long as the write is never bigger than a page size. + * it's never on a page boundary, it's safe to read/write directly + * from/to this address, as long as the read/write is never bigger than + * a page size. */ -void *lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb, - size_t offset) +void *lib_ring_buffer_read_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb, + size_t offset, + struct lttng_ust_shm_handle *handle) { - struct lib_ring_buffer_backend_pages *rpages; - struct channel_backend *chanb = &shmp(bufb->chan)->backend; - const struct lib_ring_buffer_config *config = chanb->config; + struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; unsigned long sb_bindex, id; offset &= chanb->buf_size - 1; id = bufb->buf_rsb.id; sb_bindex = subbuffer_id_get_index(config, id); - rpages = shmp(bufb->array)[sb_bindex]; + rpages = shmp_index(handle, bufb->array, sb_bindex); CHAN_WARN_ON(chanb, config->mode == RING_BUFFER_OVERWRITE && subbuffer_id_is_noref(config, id)); - return shmp(rpages->p) + (offset & ~(chanb->subbuf_size - 1)); + return shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)); } /** @@ -444,21 +476,22 @@ void *lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb, * it's always at the beginning of a page, it's safe to write directly to this * address, as long as the write is never bigger than a page size. */ -void *lib_ring_buffer_offset_address(struct lib_ring_buffer_backend *bufb, - size_t offset) +void *lib_ring_buffer_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb, + size_t offset, + struct lttng_ust_shm_handle *handle) { size_t sbidx; - struct lib_ring_buffer_backend_pages *rpages; - struct channel_backend *chanb = &shmp(bufb->chan)->backend; - const struct lib_ring_buffer_config *config = chanb->config; + struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages; + struct channel_backend *chanb = &shmp(handle, bufb->chan)->backend; + const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config; unsigned long sb_bindex, id; offset &= chanb->buf_size - 1; sbidx = offset >> chanb->subbuf_size_order; - id = shmp(bufb->buf_wsb)[sbidx].id; + id = shmp_index(handle, bufb->buf_wsb, sbidx)->id; sb_bindex = subbuffer_id_get_index(config, id); - rpages = shmp(bufb->array)[sb_bindex]; + rpages = shmp_index(handle, bufb->array, sb_bindex); CHAN_WARN_ON(chanb, config->mode == RING_BUFFER_OVERWRITE && subbuffer_id_is_noref(config, id)); - return shmp(rpages->p) + (offset & ~(chanb->subbuf_size - 1)); + return shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)); }