X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fthread-utils.cpp;h=e28106e785d99aa52a4d5f8d4dc3a40d95524c53;hp=1b8ff0881b68cbb0276037952078dff60e20e60a;hb=HEAD;hpb=f90a04edabf22fccd0ac546bf04d7d7a795e3b92 diff --git a/src/bin/lttng-sessiond/thread-utils.cpp b/src/bin/lttng-sessiond/thread-utils.cpp index 1b8ff0881..c861e0f52 100644 --- a/src/bin/lttng-sessiond/thread-utils.cpp +++ b/src/bin/lttng-sessiond/thread-utils.cpp @@ -9,7 +9,10 @@ #include "lttng-sessiond.hpp" #include "utils.hpp" + #include + +#include #include /* @@ -24,7 +27,7 @@ static int main_quit_pipe[2] = { -1, -1 }; * * Return -1 on error or 0 if all pipes are created. */ -int sessiond_init_main_quit_pipe(void) +int sessiond_init_main_quit_pipe() { int ret, i; @@ -65,7 +68,7 @@ int sessiond_wait_for_main_quit_pipe(int timeout_ms) ret = -1; goto end; } - ret = lttng_poll_add(&events, main_quit_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(&events, main_quit_pipe[0], LPOLLIN); if (ret < 0) { PERROR("Failed to add file descriptor to poll/epoll set"); ret = -1; @@ -89,12 +92,12 @@ end: return ret; } -int sessiond_notify_main_quit_pipe(void) +int sessiond_notify_main_quit_pipe() { return notify_thread_pipe(main_quit_pipe[1]); } -void sessiond_close_main_quit_pipe(void) +void sessiond_close_main_quit_pipe() { utils_close_pipe(main_quit_pipe); } @@ -114,7 +117,7 @@ int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size) } /* Add main quit pipe */ - ret = lttng_poll_add(events, main_quit_pipe[0], LPOLLIN | LPOLLERR); + ret = lttng_poll_add(events, main_quit_pipe[0], LPOLLIN); if (ret < 0) { goto error; }