*
*/
-#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;
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;
{
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);
{
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);
}
handle = lttng_payload_view_pop_fd_handle(&view);
- ok(!handle, test_description);
+ ok(!handle, "%s", test_description);
fd_handle_put(handle);
}
lttng_payload_reset(&payload);
return;
fail:
- fail(test_description);
+ fail("%s", test_description);
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);
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) {
}
lttng_payload_reset(&payload);
- pass(test_description);
+ pass("%s", test_description);
fd_handle_put(handle);
return;
fail:
lttng_payload_reset(&payload);
- fail(test_description);
+ fail("%s", test_description);
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);
}
{
- 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) {
}
lttng_payload_reset(&payload);
- pass(test_description);
+ pass("%s", test_description);
fd_handle_put(handle1);
fd_handle_put(handle2);
fd_handle_put(view_handle1);
return;
fail:
lttng_payload_reset(&payload);
- fail(test_description);
+ fail("%s", test_description);
fd_handle_put(handle1);
fd_handle_put(handle2);
fd_handle_put(view_handle1);
fd_handle_put(view_handle2);
}
-int main(void)
+int main()
{
plan_tests(TEST_COUNT);