#include <urcu/ref.h>
#include "smp.h"
-#include <ust/ringbuffer-config.h>
+#include <lttng/ringbuffer-config.h>
#include "backend.h"
#include "frontend.h"
#include "shm.h"
{
const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config;
struct channel *chan = caa_container_of(chanb, struct channel, backend);
- void *priv = chanb->priv;
- unsigned int num_subbuf;
+ void *priv = channel_get_private(chan);
size_t subbuf_header_size;
u64 tsc;
int ret;
goto free_commit;
}
- num_subbuf = chan->backend.num_subbuf;
- //init_waitqueue_head(&buf->read_wait);
-
/*
* Write the subbuffer header for first subbuffer so we know the total
* duration of data gathering.
* channel_create - Create channel.
* @config: ring buffer instance configuration
* @name: name of the channel
- * @priv: ring buffer client private data
+ * @priv_data: ring buffer client private data area pointer (output)
+ * @priv_data_size: length, in bytes, of the private data area.
+ * @priv_data_init: initialization data for private data.
* @buf_addr: pointer the the beginning of the preallocated buffer contiguous
* address mapping. It is used only by RING_BUFFER_STATIC
* configuration. It can be set to NULL for other backends.
* Returns NULL on failure.
*/
struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buffer_config *config,
- const char *name, void *priv, void *buf_addr,
- size_t subbuf_size,
+ const char *name,
+ void **priv_data,
+ size_t priv_data_align,
+ size_t priv_data_size,
+ void *priv_data_init,
+ void *buf_addr, size_t subbuf_size,
size_t num_subbuf, unsigned int switch_timer_interval,
unsigned int read_timer_interval,
int *shm_fd, int *wait_fd, uint64_t *memory_map_size)
{
int ret, cpu;
- size_t shmsize;
+ size_t shmsize, chansize;
struct channel *chan;
struct lttng_ust_shm_handle *handle;
struct shm_object *shmobj;
/* Calculate the shm allocation layout */
shmsize = sizeof(struct channel);
+ shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_shmp));
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
shmsize += sizeof(struct lttng_ust_lib_ring_buffer_shmp) * num_possible_cpus();
else
shmsize += sizeof(struct lttng_ust_lib_ring_buffer_shmp);
+ chansize = shmsize;
+ shmsize += offset_align(shmsize, priv_data_align);
+ shmsize += priv_data_size;
shmobj = shm_object_table_append(handle->table, shmsize);
if (!shmobj)
goto error_append;
/* struct channel is at object 0, offset 0 (hardcoded) */
- set_shmp(handle->chan, zalloc_shm(shmobj, sizeof(struct channel)));
+ set_shmp(handle->chan, zalloc_shm(shmobj, chansize));
assert(handle->chan._ref.index == 0);
assert(handle->chan._ref.offset == 0);
chan = shmp(handle, handle->chan);
if (!chan)
goto error_append;
- ret = channel_backend_init(&chan->backend, name, config, priv,
+ /* space for private data */
+ if (priv_data_size) {
+ DECLARE_SHMP(void, priv_data_alloc);
+
+ align_shm(shmobj, priv_data_align);
+ chan->priv_data_offset = shmobj->allocated_len;
+ set_shmp(priv_data_alloc, zalloc_shm(shmobj, priv_data_size));
+ if (!shmp(handle, priv_data_alloc))
+ goto error_append;
+ *priv_data = channel_get_private(chan);
+ memcpy(*priv_data, priv_data_init, priv_data_size);
+ } else {
+ chan->priv_data_offset = -1;
+ *priv_data = NULL;
+ }
+
+ ret = channel_backend_init(&chan->backend, name, config,
subbuf_size, num_subbuf, handle);
if (ret)
goto error_backend_init;
* Call "destroy" callback, finalize channels, decrement the channel
* reference count. Note that when readers have completed data
* consumption of finalized channels, get_subbuf() will return -ENODATA.
- * They should release their handle at that point. Returns the private
- * data pointer.
+ * They should release their handle at that point.
*/
-void *channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
+void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
int shadow)
{
const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
- void *priv;
int cpu;
if (shadow) {
channel_release(chan, handle, shadow);
- return NULL;
+ return;
}
channel_unregister_notifiers(chan, handle);
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf,
- chan->backend.priv,
+ channel_get_private(chan),
cpu, handle);
if (buf->backend.allocated)
lib_ring_buffer_switch_slow(buf, SWITCH_FLUSH,
struct lttng_ust_lib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
if (config->cb.buffer_finalize)
- config->cb.buffer_finalize(buf, chan->backend.priv, -1, handle);
+ config->cb.buffer_finalize(buf, channel_get_private(chan), -1, handle);
if (buf->backend.allocated)
lib_ring_buffer_switch_slow(buf, SWITCH_FLUSH,
handle);
* sessiond/consumer are keeping a reference on the shm file
* descriptor directly. No need to refcount.
*/
- priv = chan->backend.priv;
channel_release(chan, handle, shadow);
- return priv;
+ return;
}
struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
commit_count_sb = v_read(config, &shmp_index(handle, buf->commit_cold, cons_idx)->cc_sb);
if (subbuf_offset(commit_count, chan) != 0)
- ERRMSG("ring buffer %s, cpu %d: "
+ DBG("ring buffer %s, cpu %d: "
"commit count in subbuffer %lu,\n"
"expecting multiples of %lu bytes\n"
" [ %lu bytes committed, %lu bytes reader-visible ]\n",
chan->backend.subbuf_size,
commit_count, commit_count_sb);
- ERRMSG("ring buffer: %s, cpu %d: %lu bytes committed\n",
+ DBG("ring buffer: %s, cpu %d: %lu bytes committed\n",
chan->backend.name, cpu, commit_count);
}
write_offset = v_read(config, &buf->offset);
cons_offset = uatomic_read(&buf->consumed);
if (write_offset != cons_offset)
- ERRMSG("ring buffer %s, cpu %d: "
+ DBG("ring buffer %s, cpu %d: "
"non-consumed data\n"
" [ %lu bytes written, %lu bytes read ]\n",
chan->backend.name, cpu, write_offset, cons_offset);
struct lttng_ust_shm_handle *handle)
{
const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
- void *priv = chan->backend.priv;
+ void *priv = channel_get_private(chan);
- ERRMSG("ring buffer %s, cpu %d: %lu records written, "
+ DBG("ring buffer %s, cpu %d: %lu records written, "
"%lu records overrun\n",
chan->backend.name, cpu,
v_read(config, &buf->records_count),
if (v_read(config, &buf->records_lost_full)
|| v_read(config, &buf->records_lost_wrap)
|| v_read(config, &buf->records_lost_big))
- ERRMSG("ring buffer %s, cpu %d: records were lost. Caused by:\n"
+ DBG("ring buffer %s, cpu %d: records were lost. Caused by:\n"
" [ %lu buffer full, %lu nest buffer wrap-around, "
"%lu event too big ]\n",
chan->backend.name, cpu,
projects / lttng-ust.git / blobdiff