*
*/
+#include <common/compat/poll.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/pipe.hpp>
+#include <common/readwrite.hpp>
+
#include <inttypes.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
-
-#include <common/compat/poll.hpp>
-#include <common/readwrite.hpp>
-#include <common/pipe.hpp>
-#include <common/dynamic-array.hpp>
-
#include <tap/tap.h>
+#include <unistd.h>
/* Verification without trashing test order in the child process */
-#define childok(e, test, ...) do { \
- if (!(e)) { \
- diag(test, ## __VA_ARGS__); \
- _exit(EXIT_FAILURE); \
- } \
-} while(0)
+#define childok(e, test, ...) \
+ do { \
+ if (!(e)) { \
+ diag(test, ##__VA_ARGS__); \
+ _exit(EXIT_FAILURE); \
+ } \
+ } while (0)
/* For error.h */
int lttng_opt_quiet = 1;
#define CLOE_VALUE FD_CLOEXEC
#endif
-static
-void test_epoll_compat(void)
+static void test_epoll_compat()
{
/*
* Type conversion present to disable warning of anonymous enum from
}
#endif
-static void test_alloc(void)
+static void test_alloc()
{
struct lttng_poll_event poll_events;
lttng_poll_init(&poll_events);
/* Null pointer */
- ok(lttng_poll_create(NULL, 1, 0) != 0, "Create over NULL pointer fails");
+ ok(lttng_poll_create(nullptr, 1, 0) != 0, "Create over NULL pointer fails");
/* Size 0 */
ok(lttng_poll_create(&poll_events, 0, 0) != 0, "Create with size 0 fails");
/* without CLOEXEC */
}
/* Tests stuff related to what would be handled with epoll_ctl. */
-static void test_add_del(void)
+static void test_add_del()
{
struct lttng_poll_event poll_events;
lttng_poll_init(&poll_events);
- ok(lttng_poll_add(NULL, 1, LPOLLIN) != 0, "Adding to NULL set fails");
- ok(lttng_poll_add(&poll_events, 1, LPOLLIN) != 0, "Adding to uninitialized structure fails");
+ ok(lttng_poll_add(nullptr, 1, LPOLLIN) != 0, "Adding to NULL set fails");
+ ok(lttng_poll_add(&poll_events, 1, LPOLLIN) != 0,
+ "Adding to uninitialized structure fails");
ok(lttng_poll_add(&poll_events, -1, LPOLLIN) != 0, "Adding invalid FD fails");
ok(lttng_poll_create(&poll_events, 1, 0) == 0, "Create a poll set succeeds");
ok(LTTNG_POLL_GETNB(&poll_events) == 0, "Set created empty");
- ok(lttng_poll_add(NULL, 1, LPOLLIN) != 0, "Adding to NULL set fails");
+ ok(lttng_poll_add(nullptr, 1, LPOLLIN) != 0, "Adding to NULL set fails");
ok(LTTNG_POLL_GETNB(&poll_events) == 0, "Set still empty");
ok(lttng_poll_add(&poll_events, -1, LPOLLIN) != 0, "Adding invalid FD fails");
ok(LTTNG_POLL_GETNB(&poll_events) == 0, "Set still empty");
ok(lttng_poll_add(&poll_events, 1, LPOLLIN) == 0, "Adding valid FD succeeds");
ok(LTTNG_POLL_GETNB(&poll_events) == 1, "Nb of elements incremented");
- ok(lttng_poll_del(NULL, 1) != 0, "Removing from NULL set fails");
+ ok(lttng_poll_del(nullptr, 1) != 0, "Removing from NULL set fails");
ok(LTTNG_POLL_GETNB(&poll_events) == 1, "Number of FD in set unchanged");
ok(lttng_poll_del(&poll_events, -1) != 0, "Removing from negative FD fails");
lttng_poll_clean(&poll_events);
}
-static void test_mod_wait(void)
+static void test_mod_wait()
{
struct lttng_poll_event poll_events;
struct lttng_poll_event cpoll_events;
cpid = fork();
if (cpid == 0) {
- childok(lttng_poll_create(&cpoll_events, 1, 0) == 0, "Create valid poll set succeeds");
- childok(lttng_poll_mod(NULL, infd[0], LPOLLIN) == -1, "lttng_poll_mod with invalid input returns an error");
- childok(lttng_poll_mod(&cpoll_events, infd[0], LPOLLIN) == -1, "lttng_poll_mod with invalid input returns an error");
- childok(lttng_poll_add(&cpoll_events, infd[0], LPOLLIN) == 0, "Add valid FD succeeds");
- childok(lttng_poll_mod(&cpoll_events, -1, LPOLLIN) == -1, "lttng_poll_mod with invalid input returns an error");
- childok(lttng_poll_mod(&cpoll_events, hupfd[0], LPOLLIN) == 0, "lttng_poll_mod on unincluded FD goes on");
- childok(lttng_poll_mod(&cpoll_events, infd[0], LPOLLIN) == 0, "Modify event type succeeds");
+ childok(lttng_poll_create(&cpoll_events, 1, 0) == 0,
+ "Create valid poll set succeeds");
+ childok(lttng_poll_mod(nullptr, infd[0], LPOLLIN) == -1,
+ "lttng_poll_mod with invalid input returns an error");
+ childok(lttng_poll_mod(&cpoll_events, infd[0], LPOLLIN) == -1,
+ "lttng_poll_mod with invalid input returns an error");
+ childok(lttng_poll_add(&cpoll_events, infd[0], LPOLLIN) == 0,
+ "Add valid FD succeeds");
+ childok(lttng_poll_mod(&cpoll_events, -1, LPOLLIN) == -1,
+ "lttng_poll_mod with invalid input returns an error");
+ childok(lttng_poll_mod(&cpoll_events, hupfd[0], LPOLLIN) == 0,
+ "lttng_poll_mod on unincluded FD goes on");
+ childok(lttng_poll_mod(&cpoll_events, infd[0], LPOLLIN) == 0,
+ "Modify event type succeeds");
childok(close(infd[1]) == 0, "Close valid FD succeeds");
childok(lttng_poll_wait(&cpoll_events, -1) == 1, "Wait on close times out");
childok(lttng_read(infd[0], &rbuf, 1) == 1, "Data is present in the pipe");
ok(close(hupfd[1]) == 0, "Close valid FD succeeds");
ok(close(infd[0]) == 0, "Close valid FD succeeds");
- ok(lttng_poll_wait(NULL, -1) == -1, "lttng_poll_wait call with invalid input returns error");
+ ok(lttng_poll_wait(nullptr, -1) == -1,
+ "lttng_poll_wait call with invalid input returns error");
ok(lttng_poll_create(&poll_events, 1, 0) == 0, "Create valid poll set succeeds");
- ok(lttng_poll_wait(&poll_events, -1) == -1, "lttng_poll_wait call with invalid input returns error");
+ ok(lttng_poll_wait(&poll_events, -1) == -1,
+ "lttng_poll_wait call with invalid input returns error");
ok(lttng_poll_add(&poll_events, hupfd[0], LPOLLIN) == 0, "Add valid FD succeeds");
ok(lttng_write(infd[1], &tbuf, 1) == 1, "Write to pipe succeeds");
ok(lttng_poll_wait(&poll_events, -1) == 1, "Wakes up on one event");
lttng_pipe_destroy((lttng_pipe *) pipe);
}
-static int run_active_set_combination(unsigned int fd_count,
- unsigned int active_fds_mask)
+static int run_active_set_combination(unsigned int fd_count, unsigned int active_fds_mask)
{
int ret = 0;
unsigned int i;
const unsigned int active_fds_count = __builtin_popcount(active_fds_mask);
struct lttng_poll_event poll_events;
struct lttng_dynamic_pointer_array pipes;
- struct lttng_pipe *pipe = NULL;
+ struct lttng_pipe *pipe = nullptr;
lttng_poll_init(&poll_events);
lttng_dynamic_pointer_array_init(&pipes, destroy_pipe);
ret = lttng_poll_create(&poll_events, fd_count, 0);
if (ret) {
- diag("Failed to create poll set for %u file descriptors",
- fd_count);
+ diag("Failed to create poll set for %u file descriptors", fd_count);
goto end;
}
goto end;
}
- ret = lttng_poll_add(&poll_events, lttng_pipe_get_readfd(pipe),
- LPOLLIN);
+ ret = lttng_poll_add(&poll_events, lttng_pipe_get_readfd(pipe), LPOLLIN);
if (ret) {
diag("Failed to add file descriptor to poll set");
ret = -1;
}
/* Ownership transferred to the pointer array. */
- pipe = NULL;
+ pipe = nullptr;
}
/* Write one byte for all active fds that should be active. */
continue;
}
- borrowed_pipe =
- (lttng_pipe *) lttng_dynamic_pointer_array_get_pointer(
- &pipes, i);
+ borrowed_pipe = (lttng_pipe *) lttng_dynamic_pointer_array_get_pointer(&pipes, i);
char c = 'a';
- ret = lttng_pipe_write(
- borrowed_pipe, &c, sizeof(char));
+ ret = lttng_pipe_write(borrowed_pipe, &c, sizeof(char));
if (ret != sizeof(char)) {
diag("Failed to write to pipe");
ret = -1;
ret = lttng_poll_wait(&poll_events, 0);
if (ret != active_fds_count) {
diag("lttng_poll_wait returned %d, expected %u active file descriptors",
- ret, active_fds_count);
+ ret,
+ active_fds_count);
ret = -1;
goto end;
} else {
fail("Test all combinations of active file descriptors for %u file descriptors", fd_count);
}
-static void test_func_def(void)
+static void test_func_def()
{
#ifdef LTTNG_POLL_GETFD
#define PASS_GETFD 1
#endif
ok(lttng_poll_reset == lttng_poll_reset, "lttng_poll_reset is defined");
- ok(lttng_poll_init == lttng_poll_init , "lttng_poll_init is defined");
+ ok(lttng_poll_init == lttng_poll_init, "lttng_poll_init is defined");
ok(PASS_GETFD, "GETFD is defined");
ok(PASS_GETEV, "GETEV is defined");
ok(PASS_GETSZ, "GETSZ is defined");
ok(PASS_GET_PREV_FD, "GET_PREV_FD is defined");
}
-int main(void)
+int main()
{
plan_tests(NUM_TESTS);
#ifdef HAVE_EPOLL