X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=d078af5cf2d1115b3ea4aa6f6cc6740b94732fe1;hb=064220d4dfca7c4dee6c839702ab57aa60336937;hp=964a5586677a3dc4c68d9046a8fa9a51bac1b39c;hpb=9d335227b11499758dc06d97822ba2ebeeb0fd5c;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 964a5586..d078af5c 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License only.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -66,6 +65,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) {
@@ -138,6 +140,9 @@ int ustctl_open_metadata(int sock, int session_handle,
 	struct lttng_ust_object_data *metadata_data;
 	int ret, err = 0;
 
+	if (!chops || !_metadata_data)
+		return -EINVAL;
+
 	metadata_data = malloc(sizeof(*metadata_data));
 	if (!metadata_data)
 		return -ENOMEM;
@@ -200,6 +205,9 @@ int ustctl_create_channel(int sock, int session_handle,
 	struct lttng_ust_object_data *channel_data;
 	int ret, err = 0;
 
+	if (!chops || !_channel_data)
+		return -EINVAL;
+
 	channel_data = malloc(sizeof(*channel_data));
 	if (!channel_data)
 		return -ENOMEM;
@@ -266,6 +274,9 @@ int ustctl_create_stream(int sock, struct lttng_ust_object_data *channel_data,
 	struct lttng_ust_object_data *stream_data;
 	int ret, fd, err = 0;
 
+	if (!channel_data || !_stream_data)
+		return -EINVAL;
+
 	stream_data = malloc(sizeof(*stream_data));
 	if (!stream_data)
 		return -ENOMEM;
@@ -322,6 +333,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;
@@ -354,6 +368,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;
@@ -373,6 +390,40 @@ int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
 	return ret;
 }
 
+int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
+		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_FILTER;
+	lum.u.filter.data_size = bytecode->len;
+	lum.u.filter.reloc_offset = bytecode->reloc_offset;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+	if (ret) {
+		return ret;
+	}
+	/* send var len bytecode */
+	ret = ustcomm_send_unix_sock(sock, bytecode->data,
+				bytecode->len);
+	if (ret < 0) {
+		return ret;
+	}
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret)
+		return ret;
+	return ret;
+}
+
 /* Enable event, channel and session ioctl */
 int ustctl_enable(int sock, struct lttng_ust_object_data *object)
 {
@@ -380,6 +431,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;
@@ -397,6 +451,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;
@@ -447,6 +504,9 @@ 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;
@@ -460,12 +520,65 @@ int ustctl_tracepoint_list_get(int sock, int tp_list_handle,
 	return 0;
 }
 
+int ustctl_tracepoint_field_list(int sock)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, tp_field_list_handle;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = LTTNG_UST_ROOT_HANDLE;
+	lum.cmd = LTTNG_UST_TRACEPOINT_FIELD_LIST;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	tp_field_list_handle = lur.ret_val;
+	DBG("received tracepoint field list handle %u", tp_field_list_handle);
+	return tp_field_list_handle;
+}
+
+int ustctl_tracepoint_field_list_get(int sock, int tp_field_list_handle,
+		struct lttng_ust_field_iter *iter)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+	ssize_t len;
+
+	if (!iter)
+		return -EINVAL;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = tp_field_list_handle;
+	lum.cmd = LTTNG_UST_TRACEPOINT_FIELD_LIST_GET;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	if (lur.ret_code != USTCOMM_OK) {
+		DBG("Return code: %s", ustcomm_get_readable_code(lur.ret_code));
+		return -EINVAL;
+	}
+	len = ustcomm_recv_unix_sock(sock, iter, sizeof(*iter));
+	if (len != sizeof(*iter)) {
+		return -EINVAL;
+	}
+	DBG("received tracepoint field list entry event_name %s event_loglevel %d field_name %s field_type %d",
+		iter->event_name,
+		iter->loglevel,
+		iter->field_name,
+		iter->type);
+	return 0;
+}
+
 int ustctl_tracer_version(int sock, struct lttng_ust_tracer_version *v)
 {
 	struct ustcomm_ust_msg lum;
 	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;
@@ -495,6 +608,9 @@ int ustctl_wait_quiescent(int sock)
 
 int ustctl_calibrate(int sock, struct lttng_ust_calibrate *calibrate)
 {
+	if (!calibrate)
+		return -EINVAL;
+
 	return -ENOSYS;
 }
 
@@ -504,6 +620,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;
@@ -525,6 +644,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);
@@ -606,6 +728,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 */
@@ -630,6 +755,7 @@ 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);
 }
@@ -640,12 +766,16 @@ void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
 struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
 	int cpu)
 {
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
 	int *shm_fd, *wait_fd;
 	uint64_t *memory_map_size;
 	struct lttng_ust_lib_ring_buffer *buf;
 	int ret;
 
+	if (!handle)
+		return NULL;
+
+	chan = handle->shadow_chan;
 	buf = channel_get_ring_buffer(&chan->backend.config,
 		chan, cpu, handle, &shm_fd, &wait_fd, &memory_map_size);
 	if (!buf)
@@ -669,6 +799,7 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
 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);
 }
 
@@ -677,6 +808,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);
 }
 
@@ -686,8 +819,12 @@ int ustctl_get_mmap_len(struct lttng_ust_shm_handle *handle,
 		unsigned long *len)
 {
 	unsigned long mmap_buf_len;
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
+	chan = handle->shadow_chan;
 	if (chan->backend.config.output != RING_BUFFER_MMAP)
 		return -EINVAL;
 	mmap_buf_len = chan->backend.buf_size;
@@ -704,8 +841,12 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf,
 		unsigned long *len)
 {
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
 
+	if (!handle || !buf || !len)
+		return -EINVAL;
+
+	chan = handle->shadow_chan;
 	*len = chan->backend.subbuf_size;
 	return 0;
 }
@@ -719,9 +860,13 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *off)
 {
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
 	unsigned long sb_bindex;
 
+	if (!handle || !buf || !off)
+		return -EINVAL;
+
+	chan = handle->shadow_chan;
 	if (chan->backend.config.output != RING_BUFFER_MMAP)
 		return -EINVAL;
 	sb_bindex = subbuffer_id_get_index(&chan->backend.config,
@@ -734,8 +879,12 @@ int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
 int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
+
+	if (!handle || !buf || !len)
+		return -EINVAL;
 
+	chan = handle->shadow_chan;
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		handle);
 	return 0;
@@ -745,8 +894,12 @@ int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
 		struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-	struct channel *chan = handle->shadow_chan;
+	struct channel *chan;
+
+	if (!handle || !buf || !len)
+		return -EINVAL;
 
+	chan = handle->shadow_chan;
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		handle);
 	*len = PAGE_ALIGN(*len);
@@ -757,6 +910,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);
 }
 
@@ -765,6 +921,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;
 }
@@ -775,6 +934,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);
 }
@@ -783,6 +945,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;
 }
@@ -791,6 +956,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;
 }
@@ -799,6 +967,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);
 }
 
@@ -806,6 +977,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;
 }
@@ -814,6 +988,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);