* Channel representation within consumer.
*/
struct ustctl_consumer_channel {
- struct lttng_channel *chan; /* lttng channel buffers */
+ struct lttng_ust_channel_buffer *chan; /* lttng channel buffers */
/* initial attributes */
struct ustctl_consumer_channel_attr attr;
free(event_notifier_data);
return ret;
}
- /* Send struct lttng_ust_event_notifier */
+ /* Send struct lttng_ust_abi_event_notifier */
len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
if (len != sizeof(*event_notifier)) {
free(event_notifier_data);
{
struct shm_object_table *table;
- table = channel->chan->handle->table;
+ table = channel->chan->chan->handle->table;
if (table->size <= 0)
return -EINVAL;
return ustctl_send_channel(sock,
size_t len) /* metadata length */
{
struct lttng_ust_lib_ring_buffer_ctx ctx;
- struct lttng_channel *chan = channel->chan;
+ struct lttng_ust_channel_buffer *lttng_chan_buf = channel->chan;
const char *str = metadata_str;
int ret = 0, waitret;
size_t reserve_len, pos;
for (pos = 0; pos < len; pos += reserve_len) {
reserve_len = min_t(size_t,
- chan->ops->priv->packet_avail_size(chan->chan, chan->handle),
+ lttng_chan_buf->ops->priv->packet_avail_size(lttng_chan_buf->chan,
+ lttng_chan_buf->chan->handle),
len - pos);
- lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
- sizeof(char), -1, chan->handle);
+ lib_ring_buffer_ctx_init(&ctx, lttng_chan_buf->chan, NULL, reserve_len, sizeof(char));
/*
* We don't care about metadata buffer's records lost
* count, because we always retry here. Report error if
*/
waitret = wait_cond_interruptible_timeout(
({
- ret = chan->ops->event_reserve(&ctx, 0);
+ ret = lttng_chan_buf->ops->event_reserve(&ctx, 0);
ret != -ENOBUFS || !ret;
}),
LTTNG_METADATA_TIMEOUT_MSEC);
ret = waitret;
goto end;
}
- chan->ops->event_write(&ctx, &str[pos], reserve_len);
- chan->ops->event_commit(&ctx);
+ lttng_chan_buf->ops->event_write(&ctx, &str[pos], reserve_len);
+ lttng_chan_buf->ops->event_commit(&ctx);
}
end:
return ret;
size_t len) /* metadata length */
{
struct lttng_ust_lib_ring_buffer_ctx ctx;
- struct lttng_channel *chan = channel->chan;
+ struct lttng_ust_channel_buffer *lttng_chan_buf = channel->chan;
const char *str = metadata_str;
ssize_t reserve_len;
int ret;
reserve_len = min_t(ssize_t,
- chan->ops->priv->packet_avail_size(chan->chan, chan->handle),
+ lttng_chan_buf->ops->priv->packet_avail_size(lttng_chan_buf->chan,
+ lttng_chan_buf->chan->handle),
len);
- lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
- sizeof(char), -1, chan->handle);
- ret = chan->ops->event_reserve(&ctx, 0);
+ lib_ring_buffer_ctx_init(&ctx, lttng_chan_buf->chan, NULL, reserve_len, sizeof(char));
+ ret = lttng_chan_buf->ops->event_reserve(&ctx, 0);
if (ret != 0) {
DBG("LTTng: event reservation failed");
assert(ret < 0);
reserve_len = ret;
goto end;
}
- chan->ops->event_write(&ctx, str, reserve_len);
- chan->ops->event_commit(&ctx);
+ lttng_chan_buf->ops->event_write(&ctx, str, reserve_len);
+ lttng_chan_buf->ops->event_commit(&ctx);
end:
return reserve_len;
if (!channel)
return NULL;
- handle = channel->chan->handle;
+ handle = channel->chan->chan->handle;
if (!handle)
return NULL;
consumer_chan = stream->chan;
(void) ustctl_stream_close_wait_fd(stream);
(void) ustctl_stream_close_wakeup_fd(stream);
- lib_ring_buffer_release_read(buf, consumer_chan->chan->handle);
+ lib_ring_buffer_release_read(buf, consumer_chan->chan->chan->handle);
free(stream);
}
{
if (!chan)
return -EINVAL;
- return shm_get_wait_fd(chan->chan->handle,
- &chan->chan->handle->chan._ref);
+ return shm_get_wait_fd(chan->chan->chan->handle,
+ &chan->chan->chan->handle->chan._ref);
}
int ustctl_channel_get_wakeup_fd(struct ustctl_consumer_channel *chan)
{
if (!chan)
return -EINVAL;
- return shm_get_wakeup_fd(chan->chan->handle,
- &chan->chan->handle->chan._ref);
+ return shm_get_wakeup_fd(chan->chan->chan->handle,
+ &chan->chan->chan->handle->chan._ref);
}
int ustctl_stream_get_wait_fd(struct ustctl_consumer_stream *stream)
return -EINVAL;
buf = stream->buf;
consumer_chan = stream->chan;
- return shm_get_wait_fd(consumer_chan->chan->handle, &buf->self._ref);
+ return shm_get_wait_fd(consumer_chan->chan->chan->handle, &buf->self._ref);
}
int ustctl_stream_get_wakeup_fd(struct ustctl_consumer_stream *stream)
return -EINVAL;
buf = stream->buf;
consumer_chan = stream->chan;
- return shm_get_wakeup_fd(consumer_chan->chan->handle, &buf->self._ref);
+ return shm_get_wakeup_fd(consumer_chan->chan->chan->handle, &buf->self._ref);
}
/* For mmap mode, readable without "get" operation */
return NULL;
buf = stream->buf;
consumer_chan = stream->chan;
- return shmp(consumer_chan->chan->handle, buf->backend.memory_map);
+ return shmp(consumer_chan->chan->chan->handle, buf->backend.memory_map);
}
/* returns the length to mmap. */
return -EINVAL;
sb_bindex = subbuffer_id_get_index(&chan->backend.config,
buf->backend.buf_rsb.id);
- barray_idx = shmp_index(consumer_chan->chan->handle, buf->backend.array,
+ barray_idx = shmp_index(consumer_chan->chan->chan->handle, buf->backend.array,
sb_bindex);
if (!barray_idx)
return -EINVAL;
- pages = shmp(consumer_chan->chan->handle, barray_idx->shmp);
+ pages = shmp(consumer_chan->chan->chan->handle, barray_idx->shmp);
if (!pages)
return -EINVAL;
*off = pages->mmap_offset;
consumer_chan = stream->chan;
chan = consumer_chan->chan->chan;
*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
return 0;
}
consumer_chan = stream->chan;
chan = consumer_chan->chan->chan;
*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
*len = LTTNG_UST_PAGE_ALIGN(*len);
return 0;
}
buf = stream->buf;
consumer_chan = stream->chan;
return lib_ring_buffer_get_next_subbuf(buf,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
}
return -EINVAL;
buf = stream->buf;
consumer_chan = stream->chan;
- lib_ring_buffer_put_next_subbuf(buf, consumer_chan->chan->handle);
+ lib_ring_buffer_put_next_subbuf(buf, consumer_chan->chan->chan->handle);
return 0;
}
buf = stream->buf;
consumer_chan = stream->chan;
return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
- &buf->prod_snapshot, consumer_chan->chan->handle);
+ &buf->prod_snapshot, consumer_chan->chan->chan->handle);
}
/*
consumer_chan = stream->chan;
return lib_ring_buffer_snapshot_sample_positions(buf,
&buf->cons_snapshot, &buf->prod_snapshot,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
}
/* Get the consumer position (iteration start) */
buf = stream->buf;
consumer_chan = stream->chan;
return lib_ring_buffer_get_subbuf(buf, *pos,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
}
/* Release exclusive sub-buffer access */
return -EINVAL;
buf = stream->buf;
consumer_chan = stream->chan;
- lib_ring_buffer_put_subbuf(buf, consumer_chan->chan->handle);
+ lib_ring_buffer_put_subbuf(buf, consumer_chan->chan->chan->handle);
return 0;
}
consumer_chan = stream->chan;
lib_ring_buffer_switch_slow(buf,
producer_active ? SWITCH_ACTIVE : SWITCH_FLUSH,
- consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
}
void ustctl_clear_buffer(struct ustctl_consumer_stream *stream)
buf = stream->buf;
consumer_chan = stream->chan;
lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE,
- consumer_chan->chan->handle);
- lib_ring_buffer_clear_reader(buf, consumer_chan->chan->handle);
+ consumer_chan->chan->chan->handle);
+ lib_ring_buffer_clear_reader(buf, consumer_chan->chan->chan->handle);
}
static
if (!stream || !timestamp_begin)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !timestamp_end)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !events_discarded)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !content_size)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !packet_size)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !stream_id)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
if (!stream || !ts)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb || !client_cb->current_timestamp)
return -ENOSYS;
if (!stream || !seq)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb || !client_cb->sequence_number)
return -ENOSYS;
if (!stream || !id)
return -EINVAL;
buf = stream->buf;
- handle = stream->chan->chan->handle;
+ handle = stream->chan->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
return client_cb->instance_id(buf, handle, id);
}
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
int ustctl_has_perf_counters(void)
{
projects / lttng-ust.git / blobdiff