data->memory_map_size = 0;
}
-/*
- * If sock is negative, it means we don't have to notify the other side
- * (e.g. application has already vanished).
- */
-void ustctl_release_object(int sock, struct lttng_ust_object_data *data)
+int ustctl_release_handle(int sock, int handle)
{
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
int ret;
- if (data->shm_fd >= 0)
- close(data->shm_fd);
- if (data->wait_fd >= 0)
- close(data->wait_fd);
if (sock >= 0) {
memset(&lum, 0, sizeof(lum));
- lum.handle = data->handle;
+ lum.handle = handle;
lum.cmd = LTTNG_UST_RELEASE;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
- assert(!ret);
+ if (ret < 0) {
+ return ret;
+ }
}
- free(data);
+ return 0;
+}
+/*
+ * If sock is negative, it means we don't have to notify the other side
+ * (e.g. application has already vanished).
+ */
+int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
+{
+ int ret;
+
+ if (data->shm_fd >= 0) {
+ ret = close(data->shm_fd);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+ if (data->wait_fd >= 0) {
+ ret = close(data->wait_fd);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+ return ustctl_release_handle(sock, data->handle);
}
/*
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
struct lttng_ust_object_data *metadata_data;
- int ret;
+ int ret, err = 0;
metadata_data = malloc(sizeof(*metadata_data));
if (!metadata_data)
/* get shm fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- goto error;
- metadata_data->shm_fd = ret;
+ err = 1;
+ else
+ metadata_data->shm_fd = ret;
+ /*
+ * We need to get the second FD even if the first fails, because
+ * libust expects us to read the two FDs.
+ */
/* get wait fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
+ err = 1;
+ else
+ metadata_data->wait_fd = ret;
+ if (err)
goto error;
- metadata_data->wait_fd = ret;
*_metadata_data = metadata_data;
return 0;
error:
- ustctl_release_object(sock, metadata_data);
+ (void) ustctl_release_object(sock, metadata_data);
+ free(metadata_data);
return -EINVAL;
}
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
struct lttng_ust_object_data *channel_data;
- int ret;
+ int ret, err = 0;
channel_data = malloc(sizeof(*channel_data));
if (!channel_data)
/* get shm fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
- goto error;
- channel_data->shm_fd = ret;
+ err = 1;
+ else
+ channel_data->shm_fd = ret;
+ /*
+ * We need to get the second FD even if the first fails, because
+ * libust expects us to read the two FDs.
+ */
/* get wait fd */
ret = ustcomm_recv_fd(sock);
if (ret < 0)
+ err = 1;
+ else
+ channel_data->wait_fd = ret;
+ if (err)
goto error;
- channel_data->wait_fd = ret;
*_channel_data = channel_data;
return 0;
error:
- ustctl_release_object(sock, channel_data);
+ (void) ustctl_release_object(sock, channel_data);
+ free(channel_data);
return -EINVAL;
}
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
struct lttng_ust_object_data *stream_data;
- int ret, fd;
+ int ret, fd, err = 0;
stream_data = malloc(sizeof(*stream_data));
if (!stream_data)
/* get shm fd */
fd = ustcomm_recv_fd(sock);
if (fd < 0)
- goto error;
- stream_data->shm_fd = fd;
+ err = 1;
+ else
+ stream_data->shm_fd = fd;
+ /*
+ * We need to get the second FD even if the first fails, because
+ * libust expects us to read the two FDs.
+ */
/* get wait fd */
fd = ustcomm_recv_fd(sock);
if (fd < 0)
+ err = 1;
+ else
+ stream_data->wait_fd = fd;
+ if (err)
goto error;
- stream_data->wait_fd = fd;
*_stream_data = stream_data;
return ret;
error:
- ustctl_release_object(sock, stream_data);
+ (void) ustctl_release_object(sock, stream_data);
+ free(stream_data);
return -EINVAL;
}
strncpy(lum.u.event.name, ev->name,
LTTNG_UST_SYM_NAME_LEN);
lum.u.event.instrumentation = ev->instrumentation;
+ lum.u.event.loglevel_type = ev->loglevel_type;
+ lum.u.event.loglevel = ev->loglevel;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
if (ret) {
free(event_data);
}
int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
- char iter[LTTNG_UST_SYM_NAME_LEN])
+ struct lttng_ust_tracepoint_iter *iter)
{
struct ustcomm_ust_msg lum;
struct ustcomm_ust_reply lur;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
if (ret)
return ret;
- DBG("received tracepoint list entry %s", lur.u.tracepoint_list_entry);
- memcpy(iter, lur.u.tracepoint_list_entry, LTTNG_UST_SYM_NAME_LEN);
+ DBG("received tracepoint list entry name %s loglevel %d",
+ lur.u.tracepoint.name,
+ lur.u.tracepoint.loglevel);
+ memcpy(iter, &lur.u.tracepoint, sizeof(*iter));
return 0;
}
return -ENOSYS;
}
+int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object)
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ int ret;
+
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = object->handle;
+ lum.cmd = LTTNG_UST_FLUSH_BUFFER;
+ ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+ if (ret)
+ return ret;
+ DBG("flushed buffer handle %u", object->handle);
+ return 0;
+}
+
/* Buffer operations */
/* Map channel shm into process memory */
return NULL;
}
/*
- * Set to -1 because the lttng_ust_shm_handle destruction will take care
- * of closing shm_fd and wait_fd.
+ * Set to -1, and then close the shm fd, and set the handle shm
+ * fd to -1 too. We don't need the shm fds after they have been
+ * mapped.
+ * The wait_fd is set to -1 in chan_data because it is now owned
+ * by the handle.
*/
chan_data->shm_fd = -1;
chan_data->wait_fd = -1;
+ /* chan is object 0. This is hardcoded. */
+ if (handle->table->objects[0].shm_fd >= 0) {
+ ret = close(handle->table->objects[0].shm_fd);
+ if (ret) {
+ perror("Error closing shm_fd");
+ }
+ handle->table->objects[0].shm_fd = -1;
+ }
+
/*
* TODO: add consistency checks to be resilient if the
* application try to feed us with incoherent channel structure
channel_destroy(chan, handle, 1);
}
+/*
+ * ustctl closes the shm_fd fds after mapping it.
+ */
struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
int cpu)
{
struct channel *chan = handle->shadow_chan;
- int shm_fd, wait_fd;
- uint64_t memory_map_size;
+ int *shm_fd, *wait_fd;
+ uint64_t *memory_map_size;
struct lttng_ust_lib_ring_buffer *buf;
int ret;
ret = lib_ring_buffer_open_read(buf, handle, 1);
if (ret)
return NULL;
+ /*
+ * We can close shm_fd early, right after is has been mapped.
+ */
+ if (*shm_fd >= 0) {
+ ret = close(*shm_fd);
+ if (ret) {
+ perror("Error closing shm_fd");
+ }
+ *shm_fd = -1;
+ }
return buf;
}
projects / lttng-ust.git / blobdiff