lttng_destroy_context(lttng_chan->ctx);
chan = lttng_chan->chan;
handle = lttng_chan->handle;
- /*
- * note: lttng_chan is private data contained within handle. It
- * will be freed along with the handle.
- */
channel_destroy(chan, handle, 0);
+ free(lttng_chan);
}
static
const int *stream_fds, int nr_stream_fds,
int64_t blocking_timeout)
{
- struct lttng_channel chan_priv_init;
+ struct lttng_ust_abi_channel_config chan_priv_init;
struct lttng_ust_shm_handle *handle;
struct lttng_channel *lttng_chan;
- void *priv;
+
+ lttng_chan = zmalloc(sizeof(struct lttng_channel));
+ if (!lttng_chan)
+ return NULL;
+ memcpy(lttng_chan->uuid, uuid, LTTNG_UST_UUID_LEN);
+ lttng_chan->id = chan_id;
memset(&chan_priv_init, 0, sizeof(chan_priv_init));
memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN);
chan_priv_init.id = chan_id;
+
handle = channel_create(&client_config, name,
- &priv, __alignof__(struct lttng_channel),
- sizeof(struct lttng_channel),
+ __alignof__(struct lttng_ust_abi_channel_config),
+ sizeof(struct lttng_ust_abi_channel_config),
&chan_priv_init,
- buf_addr, subbuf_size, num_subbuf,
+ lttng_chan, buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
stream_fds, nr_stream_fds, blocking_timeout);
if (!handle)
- return NULL;
- lttng_chan = priv;
+ goto error;
lttng_chan->handle = handle;
lttng_chan->chan = shmp(handle, handle->chan);
return lttng_chan;
+
+error:
+ free(lttng_chan);
+ return NULL;
}
static
void lttng_channel_destroy(struct lttng_channel *chan)
{
channel_destroy(chan->chan, chan->handle, 1);
+ free(chan);
}
static
const int *stream_fds, int nr_stream_fds,
int64_t blocking_timeout)
{
- struct lttng_channel chan_priv_init;
+ struct lttng_ust_abi_channel_config chan_priv_init;
struct lttng_ust_shm_handle *handle;
struct lttng_channel *lttng_chan;
- void *priv;
+
+ lttng_chan = zmalloc(sizeof(struct lttng_channel));
+ if (!lttng_chan)
+ return NULL;
+ memcpy(lttng_chan->uuid, uuid, LTTNG_UST_UUID_LEN);
+ lttng_chan->id = chan_id;
memset(&chan_priv_init, 0, sizeof(chan_priv_init));
memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN);
chan_priv_init.id = chan_id;
+
handle = channel_create(&client_config, name,
- &priv, __alignof__(struct lttng_channel),
+ __alignof__(struct lttng_channel),
sizeof(struct lttng_channel),
&chan_priv_init,
- buf_addr, subbuf_size, num_subbuf,
+ lttng_chan, buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
stream_fds, nr_stream_fds, blocking_timeout);
if (!handle)
- return NULL;
- lttng_chan = priv;
+ goto error;
lttng_chan->handle = handle;
lttng_chan->chan = shmp(handle, handle->chan);
return lttng_chan;
+
+error:
+ free(lttng_chan);
+ return NULL;
}
static
void lttng_channel_destroy(struct lttng_channel *chan)
{
channel_destroy(chan->chan, chan->handle, 1);
+ free(chan);
}
static
const char *chan_name;
int chan_objd;
struct lttng_ust_shm_handle *channel_handle;
+ struct lttng_ust_abi_channel_config *lttng_chan_config;
struct lttng_channel *lttng_chan;
struct lttng_ust_lib_ring_buffer_channel *chan;
struct lttng_ust_lib_ring_buffer_config *config;
goto active; /* Refuse to add channel to active session */
}
+ lttng_chan = zmalloc(sizeof(struct lttng_channel));
+ if (!lttng_chan) {
+ ret = -ENOMEM;
+ goto lttng_chan_error;
+ }
+
channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
if (!channel_handle) {
ret = -EINVAL;
assert(chan);
chan->handle = channel_handle;
config = &chan->backend.config;
- lttng_chan = channel_get_private(chan);
- if (!lttng_chan) {
+ lttng_chan_config = channel_get_private_config(chan);
+ if (!lttng_chan_config) {
ret = -EINVAL;
goto alloc_error;
}
lttng_chan->header_type = 0;
lttng_chan->handle = channel_handle;
lttng_chan->type = type;
+ /* Copy fields from lttng ust chan config. */
+ lttng_chan->id = lttng_chan_config->id;
+ memcpy(lttng_chan->uuid, lttng_chan_config->uuid, LTTNG_UST_UUID_LEN);
+ channel_set_private(chan, lttng_chan);
/*
* We tolerate no failure path after channel creation. It will stay
notransport:
alloc_error:
channel_destroy(chan, channel_handle, 0);
+ free(lttng_chan);
return ret;
handle_error:
+ free(lttng_chan);
+lttng_chan_error:
active:
invalid:
return ret;
struct lttng_ust_shm_handle *handle);
};
+/*
+ * IMPORTANT: this structure is part of the ABI between the consumer
+ * daemon and the UST library within traced applications. Changing it
+ * breaks the UST communication protocol.
+ *
+ * TODO: remove unused fields on next UST communication protocol
+ * breaking update.
+ */
+struct lttng_ust_abi_channel_config {
+ void *unused1;
+ int unused2;
+ void *unused3;
+ void *unused4;
+ int unused5;
+ struct cds_list_head unused6;
+ void *unused7;
+ int unused8;
+ void *unused9;
+
+ /* Channel ID */
+ unsigned int id;
+ enum lttng_ust_abi_chan_type unused10;
+ unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+ int unused11:1;
+};
+
static inline
struct lttng_ust_type_integer *lttng_ust_get_type_integer(struct lttng_ust_type_common *type)
{
* address mapping. It is used only by RING_BUFFER_STATIC configuration. It can
* be set to NULL for other backends.
*
- * priv_data (output) is set to a pointer into a "priv_data_len"-sized
- * memory area for client-specific data. This memory is managed by lib
- * ring buffer. priv_data_align is the alignment required for the
- * private data area.
+ * private data is a memory area for configuration data. This memory is
+ * managed by lib ring buffer. priv_data_align is the alignment required
+ * for the private data area.
*/
__attribute__((visibility("hidden")))
extern
struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buffer_config *config,
const char *name,
- void **priv_data,
size_t priv_data_align,
size_t priv_data_size,
void *priv_data_init,
+ void *priv,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
int read_timer_enabled;
int finalized; /* Has channel been finalized */
- size_t priv_data_offset;
+ size_t priv_data_offset; /* Offset of private data channel config */
unsigned int nr_streams; /* Number of streams */
struct lttng_ust_shm_handle *handle;
/* Extended options. */
union {
struct {
int32_t blocking_timeout_ms;
+ void *priv; /* Private data pointer. */
} s;
char padding[RB_CHANNEL_PADDING];
} u;
} __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
static inline
-void *channel_get_private(struct lttng_ust_lib_ring_buffer_channel *chan)
+void *channel_get_private_config(struct lttng_ust_lib_ring_buffer_channel *chan)
{
return ((char *) chan) + chan->priv_data_offset;
}
+static inline
+void *channel_get_private(struct lttng_ust_lib_ring_buffer_channel *chan)
+{
+ return chan->u.s.priv;
+}
+
+static inline
+void channel_set_private(struct lttng_ust_lib_ring_buffer_channel *chan, void *priv)
+{
+ chan->u.s.priv = priv;
+}
+
#ifndef __rb_same_type
#define __rb_same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
#endif
struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
struct lttng_ust_lib_ring_buffer_channel *shmp_chan;
struct commit_counters_hot *cc_hot;
- void *priv = channel_get_private(chan);
+ void *priv = channel_get_private_config(chan);
size_t subbuf_header_size;
uint64_t tsc;
int ret;
* channel_create - Create channel.
* @config: ring buffer instance configuration
* @name: name of the channel
- * @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.
+ * @priv_data_align: alignment, in bytes, of the private data area. (config)
+ * @priv_data_size: length, in bytes, of the private data area. (config)
+ * @priv_data_init: initialization data for private data. (config)
+ * @priv: local private data (memory owner by caller)
* @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.
*/
struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buffer_config *config,
const char *name,
- void **priv_data,
size_t priv_data_align,
size_t priv_data_size,
void *priv_data_init,
+ void *priv,
void *buf_addr, size_t subbuf_size,
size_t num_subbuf, unsigned int switch_timer_interval,
unsigned int read_timer_interval,
/* space for private data */
if (priv_data_size) {
+ void *priv_config;
+
DECLARE_SHMP(void, priv_data_alloc);
align_shm(shmobj, priv_data_align);
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);
+ priv_config = channel_get_private_config(chan);
+ memcpy(priv_config, priv_data_init, priv_data_size);
} else {
chan->priv_data_offset = -1;
- if (priv_data)
- *priv_data = NULL;
}
chan->u.s.blocking_timeout_ms = (int32_t) blocking_timeout_ms;
+ channel_set_private(chan, priv);
+
ret = channel_backend_init(&chan->backend, name, config,
subbuf_size, num_subbuf, handle,
stream_fds);
static
void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_lib_ring_buffer_channel *chan,
- void *priv, int cpu,
- struct lttng_ust_shm_handle *handle)
+ int cpu, struct lttng_ust_shm_handle *handle)
{
const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
unsigned long write_offset, cons_offset;
struct lttng_ust_shm_handle *handle)
{
const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
- void *priv = channel_get_private(chan);
if (!strcmp(chan->backend.name, "relay-metadata-mmap")) {
DBG("ring buffer %s: %lu records written, "
v_read(config, &buf->records_lost_wrap),
v_read(config, &buf->records_lost_big));
}
- lib_ring_buffer_print_buffer_errors(buf, chan, priv, cpu, handle);
+ lib_ring_buffer_print_buffer_errors(buf, chan, cpu, handle);
}
/*
projects / lttng-ust.git / commitdiff
