X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Funit%2Ftest_payload.cpp;h=1c79b8931012b8135ee4d890bd0a9b66faf0a33d;hb=HEAD;hp=53565f5eb58db06345c7de63edd8d558ecc61083;hpb=411b31544f22b773b4aad6cdb81faa81dc05e641;p=lttng-tools.git

diff --git a/tests/unit/test_payload.cpp b/tests/unit/test_payload.cpp
index 53565f5eb..419fc893d 100644
--- a/tests/unit/test_payload.cpp
+++ b/tests/unit/test_payload.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include <unistd.h>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
 
-#include <common/compat/fcntl.h>
-#include <common/payload.h>
-#include <common/payload-view.h>
+#include <fcntl.h>
 #include <tap/tap.h>
+#include <unistd.h>
 
 static const int TEST_COUNT = 5;
 
@@ -19,7 +19,7 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-static void test_fd_push_pop_order(void)
+static void test_fd_push_pop_order()
 {
 	int ret, i;
 	struct lttng_payload payload;
@@ -49,29 +49,28 @@ static void test_fd_push_pop_order(void)
 
 	{
 		bool fail_pop = false;
-		struct lttng_payload_view view =
-				lttng_payload_view_from_payload(
-					&payload, 0, -1);
+		struct lttng_payload_view view = lttng_payload_view_from_payload(&payload, 0, -1);
 
 		for (i = 0; i < 3; i++) {
-			struct fd_handle *handle =
-					lttng_payload_view_pop_fd_handle(&view);
+			struct fd_handle *handle = lttng_payload_view_pop_fd_handle(&view);
 
 			fail_pop |= fd_handle_get_fd(handle) != fds[i];
 			fd_handle_put(handle);
 		}
 
-		ok(!fail_pop, "File descriptors are popped from a payload view in the order of insertion");
+		ok(!fail_pop,
+		   "File descriptors are popped from a payload view in the order of insertion");
 	}
 
 	lttng_payload_reset(&payload);
 }
 
-static void test_fd_push_pop_imbalance(void)
+static void test_fd_push_pop_imbalance()
 {
 	int ret, i;
 	struct lttng_payload payload;
-	const char * const test_description = "Error reported when popping more file descriptors than were pushed";
+	const char *const test_description =
+		"Error reported when popping more file descriptors than were pushed";
 
 	lttng_payload_init(&payload);
 
@@ -94,9 +93,7 @@ static void test_fd_push_pop_imbalance(void)
 
 	{
 		struct fd_handle *handle;
-		struct lttng_payload_view view =
-				lttng_payload_view_from_payload(
-					&payload, 0, -1);
+		struct lttng_payload_view view = lttng_payload_view_from_payload(&payload, 0, -1);
 
 		for (i = 0; i < 10; i++) {
 			handle = lttng_payload_view_pop_fd_handle(&view);
@@ -118,13 +115,14 @@ fail:
 	lttng_payload_reset(&payload);
 }
 
-static void test_fd_pop_fd_root_views(void)
+static void test_fd_pop_fd_root_views()
 {
 	int ret, i;
 	int fd = fcntl(STDOUT_FILENO, F_DUPFD, 0);
 	struct fd_handle *handle;
 	struct lttng_payload payload;
-	const char * const test_description = "Same file descriptor returned when popping from different top-level views";
+	const char *const test_description =
+		"Same file descriptor returned when popping from different top-level views";
 
 	LTTNG_ASSERT(fd >= 0);
 	handle = fd_handle_create(fd);
@@ -141,9 +139,7 @@ static void test_fd_pop_fd_root_views(void)
 	for (i = 0; i < 5; i++) {
 		int view_fd;
 		struct fd_handle *view_handle;
-		struct lttng_payload_view view =
-				lttng_payload_view_from_payload(
-					&payload, 0, -1);
+		struct lttng_payload_view view = lttng_payload_view_from_payload(&payload, 0, -1);
 
 		view_handle = lttng_payload_view_pop_fd_handle(&view);
 		if (!view_handle) {
@@ -167,15 +163,16 @@ fail:
 	fd_handle_put(handle);
 }
 
-static void test_fd_pop_fd_descendant_views(void)
+static void test_fd_pop_fd_descendant_views()
 {
 	int ret;
 	const int fd1 = 42, fd2 = 1837;
 	struct fd_handle *handle1 = fd_handle_create(fd1);
 	struct fd_handle *handle2 = fd_handle_create(fd2);
-	struct fd_handle *view_handle1 = NULL, *view_handle2 = NULL;
+	struct fd_handle *view_handle1 = nullptr, *view_handle2 = nullptr;
 	struct lttng_payload payload;
-	const char * const test_description = "Different file descriptors returned when popping from descendant views";
+	const char *const test_description =
+		"Different file descriptors returned when popping from descendant views";
 
 	lttng_payload_init(&payload);
 	LTTNG_ASSERT(handle1);
@@ -193,12 +190,8 @@ static void test_fd_pop_fd_descendant_views(void)
 	}
 
 	{
-		struct lttng_payload_view view1 =
-				lttng_payload_view_from_payload(
-					&payload, 0, -1);
-		struct lttng_payload_view view2 =
-			lttng_payload_view_from_view(
-				&view1, 0, -1);
+		struct lttng_payload_view view1 = lttng_payload_view_from_payload(&payload, 0, -1);
+		struct lttng_payload_view view2 = lttng_payload_view_from_view(&view1, 0, -1);
 
 		view_handle1 = lttng_payload_view_pop_fd_handle(&view1);
 		if (!view_handle1 || fd_handle_get_fd(view_handle1) != fd1) {
@@ -227,7 +220,7 @@ fail:
 	fd_handle_put(view_handle2);
 }
 
-int main(void)
+int main()
 {
 	plan_tests(TEST_COUNT);