X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=49ae3e6cf94dfc12f6ae32c176841d8a8e71cc79;hb=458d678c8e42caa810b80a99d5f6a69f24598a37;hp=bc3ea9b12266531be1a5b1d7f760b06192ff93d9;hpb=b24e4e91830659fca70cfd4381280b828bf8d360;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index bc3ea9b1..49ae3e6c 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -230,7 +230,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);
@@ -294,7 +294,7 @@ int ustctl_set_exclusion(int sock, struct lttng_ust_event_exclusion *exclusion,
 		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);
@@ -1523,11 +1523,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;
@@ -1538,11 +1540,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;
@@ -1553,11 +1557,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;
@@ -1568,11 +1574,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;
@@ -1583,11 +1591,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;
@@ -1598,11 +1608,13 @@ 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;
@@ -1613,11 +1625,13 @@ 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 = 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;