X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=75257d3e2c7297c5bded9d181df66757183174c5;hb=4f5288dcaa3fe20105650cc6631eeed1228276ee;hp=b4e927c9d4ea8212284fee020ce6bc3f81acc8cd;hpb=30b66335dc3656fc79129b9e7dfe1cf13ae578e1;p=lttng-tools.git

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index b4e927c9d..75257d3e2 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -1,23 +1,11 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
- * 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
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * SPDX-License-Identifier: GPL-2.0-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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,10 +16,13 @@
 #include <lttng/lttng.h>
 #include <bin/lttng-sessiond/lttng-ust-abi.h>
 #include <common/defaults.h>
+#include <common/compat/errno.h>
 #include <bin/lttng-sessiond/trace-ust.h>
 #include <bin/lttng-sessiond/ust-app.h>
 #include <bin/lttng-sessiond/notification-thread.h>
 
+#include <lttng/ust-sigbus.h>
+
 #include <tap/tap.h>
 
 /* This path will NEVER be created in this test */
@@ -42,17 +33,7 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 16
 
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose;
-int lttng_opt_mi;
-
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
-/* Global variables required by sessiond objects being linked-in */
-struct lttng_ht *agent_apps_ht_by_sock;
-struct notification_thread_handle *notification_thread_handle;
+DEFINE_LTTNG_UST_SIGBUS_STATE();
 
 static const char alphanum[] =
 	"0123456789"
@@ -97,6 +78,7 @@ static void test_create_one_ust_session(void)
 	   "Validate UST session");
 
 	trace_ust_destroy_session(usess);
+	trace_ust_free_session(usess);
 }
 
 static void test_create_ust_channel(void)
@@ -121,7 +103,7 @@ static void test_create_ust_channel(void)
 
 	ok(uchan->enabled == 0 &&
 	   strncmp(uchan->name, "channel0", 8) == 0 &&
-	   uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
+	   uchan->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0' &&
 	   uchan->ctx != NULL &&
 	   uchan->events != NULL &&
 	   uchan->attr.overwrite  == attr.attr.overwrite,
@@ -153,9 +135,9 @@ static void test_create_ust_event(void)
 	}
 
 	ok(event->enabled == 0 &&
-	   event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
+	   event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
 	   strcmp(event->attr.name, ev.name) == 0 &&
-	   event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
+	   event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
 	   "Validate UST event");
 
 	trace_ust_destroy_event(event);
@@ -195,9 +177,9 @@ static void test_create_ust_event_exclusion(void)
 	exclusion->count = exclusion_count;
 	random_name = get_random_string();
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name,
-		LTTNG_SYMBOL_NAME_LEN);
+		LTTNG_SYMBOL_NAME_LEN - 1);
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), random_name,
-		LTTNG_SYMBOL_NAME_LEN);
+		LTTNG_SYMBOL_NAME_LEN - 1);
 
 	ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
 	exclusion = NULL;
@@ -227,9 +209,9 @@ static void test_create_ust_event_exclusion(void)
 
 	exclusion->count = exclusion_count;
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
-		get_random_string(), LTTNG_SYMBOL_NAME_LEN);
+		get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
-		get_random_string(), LTTNG_SYMBOL_NAME_LEN);
+		get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
 
 	exclusion_copy->count = exclusion_count;
 	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
@@ -247,13 +229,13 @@ static void test_create_ust_event_exclusion(void)
 	}
 
 	ok(event->enabled == 0 &&
-		event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
+		event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
 		strcmp(event->attr.name, ev.name) == 0 &&
 		event->exclusion != NULL &&
 		event->exclusion->count == exclusion_count &&
 		!memcmp(event->exclusion->names, exclusion_copy->names,
 			LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
-		event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
+		event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
 		"Validate UST event and exclusion");
 
 	trace_ust_destroy_event(event);
@@ -275,7 +257,7 @@ static void test_create_ust_context(void)
 	ok(uctx != NULL, "Create UST context");
 
 	if (uctx) {
-		ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
+		ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID,
 		   "Validate UST context");
 	} else {
 		skip(1, "Skipping UST context validation as creation failed");