X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fevent.c;h=c153b9187397ccb930d36704570c9b3e80e639c7;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=691b4f95cd21aa77d22a9da124f0ee2de9a18379;hpb=ef0e06bcabd5f5fcf609b60d6558c2bdded5e496;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/event.c b/src/lib/lttng-ctl/event.c
index 691b4f95c..c153b9187 100644
--- a/src/lib/lttng-ctl/event.c
+++ b/src/lib/lttng-ctl/event.c
@@ -3,24 +3,13 @@
  *
  * Linux Trace Toolkit Control Library
  *
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <stddef.h>
 
 #include <common/error.h>
@@ -51,6 +40,7 @@ end:
 	return event;
 error:
 	free(event);
+	event = NULL;
 	goto end;
 }
 
@@ -78,16 +68,15 @@ int lttng_event_get_filter_expression(struct lttng_event *event,
 	const char **filter_expression)
 {
 	int ret = 0;
-	struct lttcomm_event_extended_header *ext_header;
+	struct lttng_event_extended *event_extended;
 
 	if (!event || !filter_expression) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	ext_header = event->extended.ptr;
-
-	if (!ext_header) {
+	event_extended = (struct lttng_event_extended *) event->extended.ptr;
+	if (!event_extended) {
 		/*
 		 * This can happen since the lttng_event structure is
 		 * used for other tasks where this pointer is never set.
@@ -96,42 +85,35 @@ int lttng_event_get_filter_expression(struct lttng_event *event,
 		goto end;
 	}
 
-	if (ext_header->filter_len) {
-		*filter_expression = ((const char *) (ext_header)) +
-				sizeof(*ext_header);
-	} else {
-		*filter_expression = NULL;
-	}
-
+	*filter_expression = event_extended->filter_expression;
 end:
 	return ret;
 }
 
 int lttng_event_get_exclusion_name_count(struct lttng_event *event)
 {
-	int ret;
-	struct lttcomm_event_extended_header *ext_header;
+	int ret = 0;
+	struct lttng_event_extended *event_extended;
 
 	if (!event) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	ext_header = event->extended.ptr;
-	if (!ext_header) {
+	event_extended = (struct lttng_event_extended *) event->extended.ptr;
+	if (!event_extended) {
 		/*
 		 * This can happen since the lttng_event structure is
 		 * used for other tasks where this pointer is never set.
 		 */
-		ret = 0;
 		goto end;
 	}
 
-	if (ext_header->nb_exclusions > INT_MAX) {
+	if (event_extended->exclusions.count > INT_MAX) {
 		ret = -LTTNG_ERR_OVERFLOW;
 		goto end;
 	}
-	ret = (int) ext_header->nb_exclusions;
+	ret = (int) event_extended->exclusions.count;
 end:
 	return ret;
 }
@@ -140,36 +122,41 @@ int lttng_event_get_exclusion_name(struct lttng_event *event,
 		size_t index, const char **exclusion_name)
 {
 	int ret = 0;
-	struct lttcomm_event_extended_header *ext_header;
-	void *at;
+	struct lttng_event_extended *event_extended;
 
 	if (!event || !exclusion_name) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	ext_header = event->extended.ptr;
-	if (!ext_header) {
-		ret = -LTTNG_ERR_INVALID;
+	if (index > UINT_MAX) {
+		ret = -LTTNG_ERR_OVERFLOW;
 		goto end;
 	}
 
-	if (index >= ext_header->nb_exclusions) {
+	event_extended = (struct lttng_event_extended *) event->extended.ptr;
+	if (!event_extended) {
+		/*
+		 * This can happen since the lttng_event structure is
+		 * used for other tasks where this pointer is never set.
+		 */
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	at = (void *) ext_header + sizeof(*ext_header);
-	at += ext_header->filter_len;
-	at += index * LTTNG_SYMBOL_NAME_LEN;
-	*exclusion_name = at;
+	if (index >= event_extended->exclusions.count) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
 
+	*exclusion_name = event_extended->exclusions.strings +
+		(index * LTTNG_SYMBOL_NAME_LEN);
 end:
 	return ret;
 }
 
-struct lttng_userspace_probe_location *
-lttng_event_get_userspace_probe_location(struct lttng_event *event)
+const struct lttng_userspace_probe_location *
+lttng_event_get_userspace_probe_location(const struct lttng_event *event)
 {
 	struct lttng_userspace_probe_location *probe_location = NULL;
 	struct lttng_event_extended *event_extended;
@@ -199,7 +186,7 @@ int lttng_event_set_userspace_probe_location(struct lttng_event *event,
 	}
 
 	event_extended = (struct lttng_event_extended *) event->extended.ptr;
-	assert(event_extended);
+	LTTNG_ASSERT(event_extended);
 	if (event_extended->probe_location) {
 		lttng_userspace_probe_location_destroy(
 			event_extended->probe_location);