X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=b44d9e34020a5cbe61d547c4b8ba7d01e723bc83;hb=1fd7b0dab12b14e63dfe0587cd4c703f5114919a;hp=7830132b8c41d08c295bc2dc10cee41faf3940da;hpb=b2f3252a48dfe0a2bac5b307157bcf2b25d044b3;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 7830132b..b44d9e34 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -200,6 +200,7 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	lum.u.event.instrumentation = ev->instrumentation;
 	lum.u.event.loglevel_type = ev->loglevel_type;
 	lum.u.event.loglevel = ev->loglevel;
+	lum.u.event.disabled = ev->disabled;
 	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
 	if (ret) {
 		free(event_data);
@@ -230,7 +231,7 @@ int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
 	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);
@@ -273,6 +274,40 @@ int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
 	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 }
 
+int ustctl_set_exclusion(int sock, struct lttng_ust_event_exclusion *exclusion,
+		struct lttng_ust_object_data *obj_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	if (!obj_data) {
+		return -EINVAL;
+	}
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = obj_data->handle;
+	lum.cmd = LTTNG_UST_EXCLUSION;
+	lum.u.exclusion.count = exclusion->count;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret) {
+		return ret;
+	}
+
+	/* send var len exclusion names */
+	ret = ustcomm_send_unix_sock(sock,
+			exclusion->names,
+			exclusion->count * LTTNG_UST_SYM_NAME_LEN);
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret != exclusion->count * LTTNG_UST_SYM_NAME_LEN) {
+		return -EINVAL;
+	}
+	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
 /* Enable event, channel and session ioctl */
 int ustctl_enable(int sock, struct lttng_ust_object_data *object)
 {
@@ -978,6 +1013,8 @@ 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);
 }
@@ -1186,6 +1223,8 @@ void ustctl_destroy_stream(struct ustctl_consumer_stream *stream)
 	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);
 }
@@ -1485,11 +1524,13 @@ int ustctl_get_timestamp_begin(struct ustctl_consumer_stream *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;
@@ -1500,11 +1541,13 @@ int ustctl_get_timestamp_end(struct ustctl_consumer_stream *stream,
 	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;
@@ -1515,11 +1558,13 @@ int ustctl_get_events_discarded(struct ustctl_consumer_stream *stream,
 	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;
@@ -1530,11 +1575,13 @@ int ustctl_get_content_size(struct ustctl_consumer_stream *stream,
 	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;
@@ -1545,11 +1592,13 @@ int ustctl_get_packet_size(struct ustctl_consumer_stream *stream,
 	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;
@@ -1560,17 +1609,52 @@ int ustctl_get_stream_id(struct ustctl_consumer_stream *stream,
 		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;
 	return client_cb->stream_id(buf, handle, stream_id);
 }
 
+int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
+		uint64_t *ts)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	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.
  */