X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.cpp;h=f1b197ea94b12a002cdb82c359a06570c260e5dd;hp=ee566f3957a38fd7bb4ac7a405339e332352aa04;hb=HEAD;hpb=b43eb2f612ab4a816c9c1d8f3ba3346cd722074e

diff --git a/tests/unit/test_ust_data.cpp b/tests/unit/test_ust_data.cpp
index ee566f395..ec945a036 100644
--- a/tests/unit/test_ust_data.cpp
+++ b/tests/unit/test_ust_data.cpp
@@ -5,46 +5,44 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-#include <urcu.h>
+#include <common/compat/errno.hpp>
+#include <common/defaults.hpp>
 
 #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 <bin/lttng-sessiond/lttng-ust-abi.hpp>
+#include <bin/lttng-sessiond/notification-thread.hpp>
+#include <bin/lttng-sessiond/trace-ust.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <tap/tap.h>
+#include <time.h>
+#include <unistd.h>
+#include <urcu.h>
 
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
-#define RANDOM_STRING_LEN	11
+#define RANDOM_STRING_LEN 11
 
 /* Number of TAP tests in this file */
 #define NUM_TESTS 16
 
 LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE();
 
-static const char alphanum[] =
-	"0123456789"
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	"abcdefghijklmnopqrstuvwxyz";
+static const char alphanum[] = "0123456789"
+			       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			       "abcdefghijklmnopqrstuvwxyz";
 static char random_string[RANDOM_STRING_LEN];
 
 /*
  * Return random string of 10 characters.
  * Not thread-safe.
  */
-static char *get_random_string(void)
+static char *get_random_string()
 {
 	int i;
 
@@ -57,29 +55,26 @@ static char *get_random_string(void)
 	return random_string;
 }
 
-static void test_create_one_ust_session(void)
+static void test_create_one_ust_session()
 {
-	struct ltt_ust_session *usess =
-		trace_ust_create_session(42);
+	struct ltt_ust_session *usess = trace_ust_create_session(42);
 
-	ok(usess != NULL, "Create UST session");
+	ok(usess != nullptr, "Create UST session");
 
 	if (!usess) {
 		skip(1, "UST session is null");
 		return;
 	}
 
-	ok(usess->id == 42 &&
-	   usess->active == 0 &&
-	   usess->domain_global.channels != NULL &&
-	   usess->uid == 0 &&
-	   usess->gid == 0,
+	ok(usess->id == 42 && !usess->active && usess->domain_global.channels != nullptr &&
+		   usess->uid == 0 && usess->gid == 0,
 	   "Validate UST session");
 
 	trace_ust_destroy_session(usess);
+	trace_ust_free_session(usess);
 }
 
-static void test_create_ust_channel(void)
+static void test_create_ust_channel()
 {
 	struct ltt_ust_channel *uchan;
 	struct lttng_channel attr;
@@ -90,40 +85,36 @@ static void test_create_ust_channel(void)
 	attr.attr.extended.ptr = &extended;
 
 	ok(lttng_strncpy(attr.name, "channel0", sizeof(attr.name)) == 0,
-		"Validate channel name length");
+	   "Validate channel name length");
 	uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST);
-	ok(uchan != NULL, "Create UST channel");
+	ok(uchan != nullptr, "Create UST channel");
 
 	if (!uchan) {
 		skip(1, "UST channel is null");
 		return;
 	}
 
-	ok(uchan->enabled == 0 &&
-	   strncmp(uchan->name, "channel0", 8) == 0 &&
-	   uchan->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0' &&
-	   uchan->ctx != NULL &&
-	   uchan->events != NULL &&
-	   uchan->attr.overwrite  == attr.attr.overwrite,
+	ok(!uchan->enabled && strncmp(uchan->name, "channel0", 8) == 0 &&
+		   uchan->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0' && uchan->ctx != nullptr &&
+		   uchan->events != nullptr && uchan->attr.overwrite == attr.attr.overwrite,
 	   "Validate UST channel");
 
 	trace_ust_destroy_channel(uchan);
 }
 
-static void test_create_ust_event(void)
+static void test_create_ust_event()
 {
 	struct ltt_ust_event *event;
 	struct lttng_event ev;
 	enum lttng_error_code ret;
 
 	memset(&ev, 0, sizeof(ev));
-	ok(lttng_strncpy(ev.name, get_random_string(),
-			LTTNG_SYMBOL_NAME_LEN) == 0,
-		"Validate string length");
+	ok(lttng_strncpy(ev.name, get_random_string(), LTTNG_SYMBOL_NAME_LEN) == 0,
+	   "Validate string length");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
-	ret = trace_ust_create_event(&ev, NULL, NULL, NULL, false, &event);
+	ret = trace_ust_create_event(&ev, nullptr, nullptr, nullptr, false, &event);
 
 	ok(ret == LTTNG_OK, "Create UST event");
 
@@ -132,24 +123,24 @@ static void test_create_ust_event(void)
 		return;
 	}
 
-	ok(event->enabled == 0 &&
-	   event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
-	   strcmp(event->attr.name, ev.name) == 0 &&
-	   event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
+	ok(!event->enabled && event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
+		   strcmp(event->attr.name, ev.name) == 0 &&
+		   event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
 	   "Validate UST event");
 
 	trace_ust_destroy_event(event);
 }
 
-static void test_create_ust_event_exclusion(void)
+static void test_create_ust_event_exclusion()
 {
+	int copy_ret;
 	enum lttng_error_code ret;
 	struct ltt_ust_event *event;
 	struct lttng_event ev;
 	char *name;
 	char *random_name;
-	struct lttng_event_exclusion *exclusion = NULL;
-	struct lttng_event_exclusion *exclusion_copy = NULL;
+	struct lttng_event_exclusion *exclusion = nullptr;
+	struct lttng_event_exclusion *exclusion_copy = nullptr;
 	const int exclusion_count = 2;
 
 	memset(&ev, 0, sizeof(ev));
@@ -157,16 +148,15 @@ static void test_create_ust_event_exclusion(void)
 	/* make a wildcarded event name */
 	name = get_random_string();
 	name[strlen(name) - 1] = '*';
-	ok(lttng_strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN) == 0,
-		"Validate string length");
+	ok(lttng_strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN) == 0, "Validate string length");
 
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	/* set up an exclusion set */
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
-		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
-	ok(exclusion != NULL, "Create UST exclusion");
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
+						   LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != nullptr, "Create UST exclusion");
 	if (!exclusion) {
 		skip(4, "zmalloc failed");
 		goto end;
@@ -174,26 +164,28 @@ 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,
+	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+		random_name,
 		LTTNG_SYMBOL_NAME_LEN - 1);
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), random_name,
+	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+		random_name,
 		LTTNG_SYMBOL_NAME_LEN - 1);
 
-	ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
-	exclusion = NULL;
+	ret = trace_ust_create_event(&ev, nullptr, nullptr, exclusion, false, &event);
+	exclusion = nullptr;
 
 	ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails");
 
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
-		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
-	ok(exclusion != NULL, "Create UST exclusion");
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
+						   LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	ok(exclusion != nullptr, "Create UST exclusion");
 	if (!exclusion) {
 		skip(2, "zmalloc failed");
 		goto end;
 	}
 
-	exclusion_copy = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
-		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
+	exclusion_copy = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
+							LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	if (!exclusion_copy) {
 		skip(2, "zmalloc failed");
 		goto end;
@@ -206,19 +198,27 @@ 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 - 1);
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
-		get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+				 get_random_string(),
+				 sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0)));
+	LTTNG_ASSERT(copy_ret == 0);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+				 get_random_string(),
+				 sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1)));
+	LTTNG_ASSERT(copy_ret == 0);
 
 	exclusion_copy->count = exclusion_count;
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
-		LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), LTTNG_SYMBOL_NAME_LEN);
-	strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
-		LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN);
-
-	ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
-	exclusion = NULL;
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
+				 LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+				 sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0)));
+	LTTNG_ASSERT(copy_ret == 0);
+	copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
+				 LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+				 sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1)));
+	LTTNG_ASSERT(copy_ret == 0);
+
+	ret = trace_ust_create_event(&ev, nullptr, nullptr, exclusion, false, &event);
+	exclusion = nullptr;
 	ok(ret == LTTNG_OK, "Create UST event with different exclusion names");
 
 	if (!event) {
@@ -226,15 +226,14 @@ static void test_create_ust_event_exclusion(void)
 		goto end;
 	}
 
-	ok(event->enabled == 0 &&
-		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_ABI_SYM_NAME_LEN - 1] == '\0',
-		"Validate UST event and exclusion");
+	ok(!event->enabled && event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT &&
+		   strcmp(event->attr.name, ev.name) == 0 && event->exclusion != nullptr &&
+		   event->exclusion->count == exclusion_count &&
+		   !memcmp(event->exclusion->names,
+			   exclusion_copy->names,
+			   LTTNG_SYMBOL_NAME_LEN * exclusion_count) &&
+		   event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0',
+	   "Validate UST event and exclusion");
 
 	trace_ust_destroy_event(event);
 end:
@@ -243,8 +242,7 @@ end:
 	return;
 }
 
-
-static void test_create_ust_context(void)
+static void test_create_ust_context()
 {
 	struct lttng_event_context ectx;
 	struct ltt_ust_context *uctx;
@@ -252,18 +250,17 @@ static void test_create_ust_context(void)
 	ectx.ctx = LTTNG_EVENT_CONTEXT_VTID;
 
 	uctx = trace_ust_create_context(&ectx);
-	ok(uctx != NULL, "Create UST context");
+	ok(uctx != nullptr, "Create UST context");
 
 	if (uctx) {
-		ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID,
-		   "Validate UST context");
+		ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID, "Validate UST context");
 	} else {
 		skip(1, "Skipping UST context validation as creation failed");
 	}
 	free(uctx);
 }
 
-int main(int argc, char **argv)
+int main()
 {
 	plan_tests(NUM_TESTS);