Fix UST renaming and update ust headers

[lttng-tools.git] / ltt-sessiond / compat / compat-epoll.c

diff --git a/ltt-sessiond/compat/compat-epoll.c b/ltt-sessiond/compat/compat-epoll.c
index 578dd2e455a0ada7573972b9aebf913369208e7c..e909b603c6bdb75fd47869548c9e1d70ec8696e3 100644 (file)
--- a/ltt-sessiond/compat/compat-epoll.c
+++ b/ltt-sessiond/compat/compat-epoll.c
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <config.h>
 
 #include <lttngerr.h>
 
@@ -171,7 +172,9 @@ int compat_epoll_wait(struct lttng_poll_event *events, int timeout)
                goto error;
        }
 
-       ret = epoll_wait(events->epfd, events->events, events->nb_fd, timeout);
+       do {
+               ret = epoll_wait(events->epfd, events->events, events->nb_fd, timeout);
+       } while (ret == -1 && errno == EINTR);
        if (ret < 0) {
                /* At this point, every error is fatal */
                perror("epoll_wait");