#include "../libringbuffer/frontend.h"
#include "../liblttng-ust/wait.h"
#include "../liblttng-ust/lttng-rb-clients.h"
+#include "../liblttng-ust/clock.h"
/*
* Number of milliseconds to retry before failing metadata writes on
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);
/* Buffer operations */
+int ustctl_get_nr_stream_per_channel(void)
+{
+ return num_possible_cpus();
+}
+
struct ustctl_consumer_channel *
- ustctl_create_channel(struct ustctl_consumer_channel_attr *attr)
+ ustctl_create_channel(struct ustctl_consumer_channel_attr *attr,
+ const int *stream_fds, int nr_stream_fds)
{
struct ustctl_consumer_channel *chan;
const char *transport_name;
attr->subbuf_size, attr->num_subbuf,
attr->switch_timer_interval,
attr->read_timer_interval,
- attr->uuid, attr->chan_id);
+ attr->uuid, attr->chan_id,
+ stream_fds, nr_stream_fds);
if (!chan->chan) {
goto chan_error;
}
chan->ops->packet_avail_size(chan->chan, chan->handle),
len - pos);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
- sizeof(char), -1, chan->handle);
+ sizeof(char), -1, chan->handle, NULL);
/*
* We don't care about metadata buffer's records lost
* count, because we always retry here. Report error if
chan->ops->packet_avail_size(chan->chan, chan->handle),
len);
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
- sizeof(char), -1, chan->handle);
+ sizeof(char), -1, chan->handle, NULL);
ret = chan->ops->event_reserve(&ctx, 0);
if (ret != 0) {
DBG("LTTng: event reservation failed");
unsigned long sb_bindex;
struct lttng_ust_lib_ring_buffer *buf;
struct ustctl_consumer_channel *consumer_chan;
+ struct lttng_ust_lib_ring_buffer_backend_pages_shmp *barray_idx;
+ struct lttng_ust_lib_ring_buffer_backend_pages *pages;
if (!stream)
return -EINVAL;
return -EINVAL;
sb_bindex = subbuffer_id_get_index(&chan->backend.config,
buf->backend.buf_rsb.id);
- *off = shmp(consumer_chan->chan->handle,
- shmp_index(consumer_chan->chan->handle, buf->backend.array, sb_bindex)->shmp)->mmap_offset;
+ barray_idx = shmp_index(consumer_chan->chan->handle, buf->backend.array,
+ sb_bindex);
+ if (!barray_idx)
+ return -EINVAL;
+ pages = shmp(consumer_chan->chan->handle, barray_idx->shmp);
+ if (!pages)
+ return -EINVAL;
+ *off = pages->mmap_offset;
return 0;
}
struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
chan = shmp(handle, buf->backend.chan);
+ if (!chan)
+ return NULL;
config = &chan->backend.config;
if (!config->cb_ptr)
return NULL;
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.
*/
case 1:
*notify_cmd = USTCTL_NOTIFY_CMD_CHANNEL;
break;
+ case 2:
+ *notify_cmd = USTCTL_NOTIFY_CMD_ENUM;
+ break;
default:
return -EINVAL;
}
return 0;
}
+/*
+ * Returns 0 on success, negative UST or system error value on error.
+ */
+int ustctl_recv_register_enum(int sock,
+ int *session_objd,
+ char *enum_name,
+ struct ustctl_enum_entry **entries,
+ size_t *nr_entries)
+{
+ ssize_t len;
+ struct ustcomm_notify_enum_msg msg;
+ size_t entries_len;
+ struct ustctl_enum_entry *a_entries = NULL;
+
+ len = ustcomm_recv_unix_sock(sock, &msg, sizeof(msg));
+ if (len > 0 && len != sizeof(msg))
+ return -EIO;
+ if (len == 0)
+ return -EPIPE;
+ if (len < 0)
+ return len;
+
+ *session_objd = msg.session_objd;
+ strncpy(enum_name, msg.enum_name, LTTNG_UST_SYM_NAME_LEN);
+ enum_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+ entries_len = msg.entries_len;
+
+ if (entries_len % sizeof(*a_entries) != 0) {
+ return -EINVAL;
+ }
+
+ /* recv entries */
+ if (entries_len) {
+ a_entries = zmalloc(entries_len);
+ if (!a_entries)
+ return -ENOMEM;
+ len = ustcomm_recv_unix_sock(sock, a_entries, entries_len);
+ if (len > 0 && len != entries_len) {
+ len = -EIO;
+ goto entries_error;
+ }
+ if (len == 0) {
+ len = -EPIPE;
+ goto entries_error;
+ }
+ if (len < 0) {
+ goto entries_error;
+ }
+ }
+ *nr_entries = entries_len / sizeof(*a_entries);
+ *entries = a_entries;
+
+ return 0;
+
+entries_error:
+ free(a_entries);
+ return len;
+}
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_reply_register_enum(int sock,
+ uint64_t id,
+ int ret_code)
+{
+ ssize_t len;
+ struct {
+ struct ustcomm_notify_hdr header;
+ struct ustcomm_notify_enum_reply r;
+ } reply;
+
+ memset(&reply, 0, sizeof(reply));
+ reply.header.notify_cmd = USTCTL_NOTIFY_CMD_ENUM;
+ reply.r.ret_code = ret_code;
+ reply.r.enum_id = id;
+ len = ustcomm_send_unix_sock(sock, &reply, sizeof(reply));
+ if (len > 0 && len != sizeof(reply))
+ return -EIO;
+ if (len < 0)
+ return len;
+ return 0;
+}
+
/*
* Returns 0 on success, negative UST or system error value on error.
*/
void ustctl_init(void)
{
init_usterr();
+ lttng_ust_clock_init();
lttng_ring_buffer_metadata_client_init();
lttng_ring_buffer_client_overwrite_init();
lttng_ring_buffer_client_overwrite_rt_init();