memset(&lum, 0, sizeof(lum));
lum.handle = obj_data->handle;
lum.cmd = LTTNG_UST_CONTEXT;
- lum.u.context.ctx = ctx->ctx;
+ lum.u.context = *ctx;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
if (ret) {
free(context_data);
return ret;
}
- /* send var len bytecode */
+ /* send var len exclusion names */
ret = ustcomm_send_unix_sock(sock,
exclusion->names,
exclusion->count * LTTNG_UST_SYM_NAME_LEN);
attr->subbuf_size, attr->num_subbuf,
attr->switch_timer_interval,
attr->read_timer_interval,
- attr->uuid, attr->chan_id);
+ attr->uuid, attr->chan_id,
+ attr->shm_path[0] == '\0' ? NULL : attr->shm_path);
if (!chan->chan) {
goto chan_error;
}
void ustctl_destroy_channel(struct ustctl_consumer_channel *chan)
{
+ (void) ustctl_channel_close_wait_fd(chan);
+ (void) ustctl_channel_close_wakeup_fd(chan);
chan->chan->ops->channel_destroy(chan->chan);
free(chan);
}
assert(stream);
buf = stream->buf;
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);
free(stream);
}
uint64_t *timestamp_begin)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !timestamp_begin)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *timestamp_end)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !timestamp_end)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *events_discarded)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !events_discarded)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *content_size)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !content_size)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *packet_size)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !packet_size)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *stream_id)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !stream_id)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb)
return -ENOSYS;
uint64_t *ts)
{
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
- struct lttng_ust_lib_ring_buffer *buf = stream->buf;
- struct lttng_ust_shm_handle *handle = stream->chan->chan->handle;
+ struct lttng_ust_lib_ring_buffer *buf;
+ struct lttng_ust_shm_handle *handle;
if (!stream || !ts)
return -EINVAL;
+ buf = stream->buf;
+ handle = stream->chan->chan->handle;
client_cb = get_client_cb(buf, handle);
if (!client_cb || !client_cb->current_timestamp)
return -ENOSYS;
return client_cb->current_timestamp(buf, handle, ts);
}
+#if defined(__x86_64__) || defined(__i386__)
+
+int ustctl_has_perf_counters(void)
+{
+ return 1;
+}
+
+#else
+
+int ustctl_has_perf_counters(void)
+{
+ return 0;
+}
+
+#endif
+
/*
* Returns 0 on success, negative error value on error.
*/