X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fthread-utils.cpp;h=fc6c64dbd55cf47b17dbd6e56b31bc53c9a5b5d8;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=d469f90e55f67b28730c64955aacfb4757716682;hpb=8a00688e1d58cc5a2e77eba206ff23bd6105130c;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/thread-utils.cpp b/src/bin/lttng-relayd/thread-utils.cpp index d469f90e5..fc6c64dbd 100644 --- a/src/bin/lttng-relayd/thread-utils.cpp +++ b/src/bin/lttng-relayd/thread-utils.cpp @@ -42,7 +42,7 @@ static int notify_thread_pipe(int wpipe) int relayd_init_thread_quit_pipe(void) { return fd_tracker_util_pipe_open_cloexec( - the_fd_tracker, "Thread quit pipe", thread_quit_pipe); + the_fd_tracker, "Thread quit pipe", thread_quit_pipe); } /* @@ -61,8 +61,7 @@ int relayd_notify_thread_quit_pipe(void) void relayd_close_thread_quit_pipe(void) { if (thread_quit_pipe[0] != -1) { - (void) fd_tracker_util_pipe_close( - the_fd_tracker, thread_quit_pipe); + (void) fd_tracker_util_pipe_close(the_fd_tracker, thread_quit_pipe); } } @@ -77,22 +76,21 @@ bool relayd_is_thread_quit_pipe(const int fd) /* * Create a poll set with O_CLOEXEC and add the thread quit pipe to the set. */ -int create_named_thread_poll_set(struct lttng_poll_event *events, - int size, const char *name) +int create_named_thread_poll_set(struct lttng_poll_event *events, int size, const char *name) { if (events == NULL || size == 0) { return -1; } - const auto create_ret = fd_tracker_util_poll_create(the_fd_tracker, - name, events, 1, LTTNG_CLOEXEC); + const auto create_ret = + fd_tracker_util_poll_create(the_fd_tracker, name, events, 1, LTTNG_CLOEXEC); if (create_ret) { PERROR("Failed to create \"%s\" poll file descriptor", name); return -1; } /* Add thread quit pipe to monitored events. */ - const auto poll_add_ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR); + const auto poll_add_ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN); if (poll_add_ret < 0) { return -1; }