X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=49757ffdf552ac31da68c1960008f0b1c204ee39;hb=refs%2Fheads%2Fstable-2.5;hp=00d9802ee300a1dfc391e08d3f3e9f1cba0e398f;hpb=da57c034d2c49ed1d4339a776859d44603fc7929;p=lttng-ust.git diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c index 00d9802e..49757ffd 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); @@ -294,7 +295,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); @@ -1012,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); } @@ -1220,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); } @@ -1329,6 +1334,8 @@ int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream, 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; @@ -1339,8 +1346,14 @@ int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream, 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; } @@ -1506,6 +1519,8 @@ struct lttng_ust_client_lib_ring_buffer_client_cb *get_client_cb( 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; @@ -1519,11 +1534,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; @@ -1534,11 +1551,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; @@ -1549,11 +1568,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; @@ -1564,11 +1585,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; @@ -1579,11 +1602,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; @@ -1594,11 +1619,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; @@ -1609,11 +1636,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;