X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=5a025f2a682fd3b1c89a7b9bdf4cd69d5de28496;hb=9bfc503d5a3e2b1a75fa00a32b5d9bd7ac4f4dc3;hp=f7e13a1a06e8618823899e8a49286278d8f4ce5a;hpb=ef9ff354212ff4b038e1a5b6a7ed0ffe1b949663;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index f7e13a1a..5a025f2a 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#define _GNU_SOURCE
 #include <string.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
@@ -65,6 +66,9 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 {
 	int ret;
 
+	if (!data)
+		return -EINVAL;
+
 	if (data->shm_fd >= 0) {
 		ret = close(data->shm_fd);
 		if (ret < 0) {
@@ -135,7 +139,10 @@ int ustctl_open_metadata(int sock, int session_handle,
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
 	struct lttng_ust_object_data *metadata_data;
-	int ret;
+	int ret, err = 0;
+
+	if (!chops || !_metadata_data)
+		return -EINVAL;
 
 	metadata_data = malloc(sizeof(*metadata_data));
 	if (!metadata_data)
@@ -166,13 +173,21 @@ int ustctl_open_metadata(int sock, int session_handle,
 	/* 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;
 
@@ -189,7 +204,10 @@ int ustctl_create_channel(int sock, int session_handle,
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
 	struct lttng_ust_object_data *channel_data;
-	int ret;
+	int ret, err = 0;
+
+	if (!chops || !_channel_data)
+		return -EINVAL;
 
 	channel_data = malloc(sizeof(*channel_data));
 	if (!channel_data)
@@ -220,13 +238,21 @@ int ustctl_create_channel(int sock, int session_handle,
 	/* 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;
 
@@ -247,7 +273,10 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
 	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;
+
+	if (!channel_data || !_stream_data)
+		return -EINVAL;
 
 	stream_data = malloc(sizeof(*stream_data));
 	if (!stream_data)
@@ -272,13 +301,21 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_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;
 
@@ -297,6 +334,9 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	struct lttng_ust_object_data *event_data;
 	int ret;
 
+	if (!channel_data || !_event_data)
+		return -EINVAL;
+
 	event_data = malloc(sizeof(*event_data));
 	if (!event_data)
 		return -ENOMEM;
@@ -307,6 +347,8 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	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);
@@ -327,6 +369,9 @@ int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
 	struct lttng_ust_object_data *context_data;
 	int ret;
 
+	if (!obj_data || !_context_data)
+		return -EINVAL;
+
 	context_data = malloc(sizeof(*context_data));
 	if (!context_data)
 		return -ENOMEM;
@@ -353,6 +398,9 @@ int ustctl_enable(int sock, struct lttng_ust_object_data *object)
 	struct ustcomm_ust_reply lur;
 	int ret;
 
+	if (!object)
+		return -EINVAL;
+
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = object->handle;
 	lum.cmd = LTTNG_UST_ENABLE;
@@ -370,6 +418,9 @@ int ustctl_disable(int sock, struct lttng_ust_object_data *object)
 	struct ustcomm_ust_reply lur;
 	int ret;
 
+	if (!object)
+		return -EINVAL;
+
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = object->handle;
 	lum.cmd = LTTNG_UST_DISABLE;
@@ -420,16 +471,18 @@ int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
 	struct ustcomm_ust_reply lur;
 	int ret;
 
+	if (!iter)
+		return -EINVAL;
+
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = tp_list_handle;
 	lum.cmd = LTTNG_UST_TRACEPOINT_LIST_GET;
 	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
 	if (ret)
 		return ret;
-	DBG("received tracepoint list entry name %s loglevel %s loglevel_value %lld",
+	DBG("received tracepoint list entry name %s loglevel %d",
 		lur.u.tracepoint.name,
-		lur.u.tracepoint.loglevel,
-		(unsigned long long) lur.u.tracepoint.loglevel_value);
+		lur.u.tracepoint.loglevel);
 	memcpy(iter, &lur.u.tracepoint, sizeof(*iter));
 	return 0;
 }
@@ -440,6 +493,9 @@ int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)
 	struct ustcomm_ust_reply lur;
 	int ret;
 
+	if (!v)
+		return -EINVAL;
+
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = LTTNG_UST_ROOT_HANDLE;
 	lum.cmd = LTTNG_UST_TRACER_VERSION;
@@ -469,6 +525,9 @@ int ustctl_wait_quiescent(int sock)
 
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
 {
+	if (!calibrate)
+		return -EINVAL;
+
 	return -ENOSYS;
 }
 
@@ -478,6 +537,9 @@ int ustctl_sock_flush_buffer(int sock, struct lttng_ust_object_data *object)
 	struct ustcomm_ust_reply lur;
 	int ret;
 
+	if (!object)
+		return -EINVAL;
+
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = object->handle;
 	lum.cmd = LTTNG_UST_FLUSH_BUFFER;
@@ -499,6 +561,9 @@ struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *ch
 	struct lttng_ust_lib_ring_buffer_config *config;
 	int ret;
 
+	if (!chan_data)
+		return NULL;
+
 	handle = channel_handle_create(chan_data->shm_fd,
 		chan_data->wait_fd,
 		chan_data->memory_map_size);
@@ -507,12 +572,24 @@ struct lttng_ust_shm_handle *ustctl_map_channel(struct lttng_ust_object_data *ch
 		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
@@ -568,6 +645,9 @@ int ustctl_add_stream(struct lttng_ust_shm_handle *handle,
 {
 	int ret;
 
+	if (!handle || !stream_data)
+		return -EINVAL;
+
 	if (!stream_data->handle)
 		return -ENOENT;
 	/* map stream */
@@ -592,10 +672,14 @@ void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan;
 
+	assert(handle);
 	chan = shmp(handle, handle->chan);
 	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)
 {
@@ -605,6 +689,9 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
 	struct lttng_ust_lib_ring_buffer *buf;
 	int ret;
 
+	if (!handle)
+		return NULL;
+
 	buf = channel_get_ring_buffer(&chan->backend.config,
 		chan, cpu, handle, &shm_fd, &wait_fd, &memory_map_size);
 	if (!buf)
@@ -612,12 +699,23 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
 	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;
 }
 
 void ustctl_close_stream_read(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	assert(handle && buf);
 	lib_ring_buffer_release_read(buf, handle, 1);
 }
 
@@ -626,6 +724,8 @@ void ustctl_close_stream_read(struct lttng_ust_shm_handle *handle,
 void *ustctl_get_mmap_base(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	if (!handle || !buf)
+		return NULL;
 	return shmp(handle, buf->backend.memory_map);
 }
 
@@ -637,6 +737,9 @@ int ustctl_get_mmap_len(struct lttng_ust_shm_handle *handle,
 	unsigned long mmap_buf_len;
 	struct channel *chan = handle->shadow_chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
 	if (chan->backend.config.output != RING_BUFFER_MMAP)
 		return -EINVAL;
 	mmap_buf_len = chan->backend.buf_size;
@@ -655,6 +758,9 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
 {
 	struct channel *chan = handle->shadow_chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
 	*len = chan->backend.subbuf_size;
 	return 0;
 }
@@ -671,6 +777,9 @@ int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
 	struct channel *chan = handle->shadow_chan;
 	unsigned long sb_bindex;
 
+	if (!handle || !buf || !off)
+		return -EINVAL;
+
 	if (chan->backend.config.output != RING_BUFFER_MMAP)
 		return -EINVAL;
 	sb_bindex = subbuffer_id_get_index(&chan->backend.config,
@@ -685,6 +794,9 @@ int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
 {
 	struct channel *chan = handle->shadow_chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		handle);
 	return 0;
@@ -696,6 +808,9 @@ int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
 {
 	struct channel *chan = handle->shadow_chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		handle);
 	*len = PAGE_ALIGN(*len);
@@ -706,6 +821,9 @@ int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_next_subbuf(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	if (!handle || !buf)
+		return -EINVAL;
+
 	return lib_ring_buffer_get_next_subbuf(buf, handle);
 }
 
@@ -714,6 +832,9 @@ int ustctl_get_next_subbuf(struct lttng_ust_shm_handle *handle,
 int ustctl_put_next_subbuf(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	if (!handle || !buf)
+		return -EINVAL;
+
 	lib_ring_buffer_put_next_subbuf(buf, handle);
 	return 0;
 }
@@ -724,6 +845,9 @@ int ustctl_put_next_subbuf(struct lttng_ust_shm_handle *handle,
 int ustctl_snapshot(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	if (!handle || !buf)
+		return -EINVAL;
+
 	return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
 			&buf->prod_snapshot, handle);
 }
@@ -732,6 +856,9 @@ int ustctl_snapshot(struct lttng_ust_shm_handle *handle,
 int ustctl_snapshot_get_consumed(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
+	if (!handle || !buf || !pos)
+		return -EINVAL;
+
 	*pos = buf->cons_snapshot;
 	return 0;
 }
@@ -740,6 +867,9 @@ int ustctl_snapshot_get_consumed(struct lttng_ust_shm_handle *handle,
 int ustctl_snapshot_get_produced(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
+	if (!handle || !buf || !pos)
+		return -EINVAL;
+
 	*pos = buf->prod_snapshot;
 	return 0;
 }
@@ -748,6 +878,9 @@ int ustctl_snapshot_get_produced(struct lttng_ust_shm_handle *handle,
 int ustctl_get_subbuf(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *pos)
 {
+	if (!handle || !buf || !pos)
+		return -EINVAL;
+
 	return lib_ring_buffer_get_subbuf(buf, *pos, handle);
 }
 
@@ -755,6 +888,9 @@ int ustctl_get_subbuf(struct lttng_ust_shm_handle *handle,
 int ustctl_put_subbuf(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf)
 {
+	if (!handle || !buf)
+		return -EINVAL;
+
 	lib_ring_buffer_put_subbuf(buf, handle);
 	return 0;
 }
@@ -763,6 +899,7 @@ void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf,
 		int producer_active)
 {
+	assert(handle && buf);
 	lib_ring_buffer_switch_slow(buf,
 		producer_active ? SWITCH_ACTIVE : SWITCH_FLUSH,
 		handle);