put poll() calls in loops in case they are interrupted by signals

diff --git a/libust/tracectl.c b/libust/tracectl.c
index a68dc7bd7e9e4a1684d753b6be5ce9da24d4f2a5..5ccd1f5eba14b0846223f297ea78408c9af37fa0 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -164,7 +164,8 @@ void process_blocked_consumers(void)
                idx++;
        }
 
-       result = poll(fds, n_fds, 0);
+       while((result = poll(fds, n_fds, 0)) == -1 && errno == EINTR)
+               /* nothing */;
        if(result == -1) {
                PERROR("poll");
                return;

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 225d1990be042a18cf0cde7c297e92c61b48c386..0a5ab6aaaf1110d8e66a44b123f81f4d9829c878 100644 (file)
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -272,7 +272,8 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
                        idx++;
                }
 
-               result = poll(fds, n_fds, timeout);
+               while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
+                       /* nothing */;
                if(result == -1) {
                        PERROR("poll");
                        return -1;