X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.cpp;h=cdd9cbd66dd033a3e6b60486562a6107a6722c4f;hb=a9cfc0f36bf8ade64df08392b03a9f15409dc01b;hp=e62f6b571e5db99e34a893575633506815446812;hpb=f2c057a6c6933c7975d27117e0cac9cb44789cc6;p=lttng-tools.git

diff --git a/tests/unit/test_ust_data.cpp b/tests/unit/test_ust_data.cpp
index e62f6b571..cdd9cbd66 100644
--- a/tests/unit/test_ust_data.cpp
+++ b/tests/unit/test_ust_data.cpp
@@ -13,12 +13,12 @@
 #include <urcu.h>
 
 #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 <bin/lttng-sessiond/lttng-ust-abi.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/errno.hpp>
+#include <bin/lttng-sessiond/trace-ust.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
+#include <bin/lttng-sessiond/notification-thread.hpp>
 
 #include <lttng/ust-sigbus.h>
 
@@ -77,6 +77,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)
@@ -165,7 +166,7 @@ static void test_create_ust_event_exclusion(void)
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	/* set up an exclusion set */
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
@@ -185,7 +186,7 @@ static void test_create_ust_event_exclusion(void)
 
 	ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails");
 
-	exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	ok(exclusion != NULL, "Create UST exclusion");
 	if (!exclusion) {
@@ -193,7 +194,7 @@ static void test_create_ust_event_exclusion(void)
 		goto end;
 	}
 
-	exclusion_copy = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+	exclusion_copy = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
 		LTTNG_SYMBOL_NAME_LEN * exclusion_count);
 	if (!exclusion_copy) {
 		skip(2, "zmalloc failed");