fio: fix interaction between offset/size limited threads and "max_open_zones"

[fio.git] / helper_thread.c

diff --git a/helper_thread.c b/helper_thread.c
index 28f6cca323d303fc370877610ba65513d509cd39..7874985504be2aa6c4c82c7683320c39409d927d 100644 (file)
--- a/helper_thread.c
+++ b/helper_thread.c
@@ -1,3 +1,4 @@
+#include <signal.h>
 #ifdef CONFIG_VALGRIND_DEV
 #include <valgrind/drd.h>
 #else
@@ -137,6 +138,18 @@ static void *helper_thread_main(void *data)
 
        sk_out_assign(hd->sk_out);
 
+#ifdef HAVE_PTHREAD_SIGMASK
+       {
+       sigset_t sigmask;
+
+       /* Let another thread handle signals. */
+       ret = pthread_sigmask(SIG_UNBLOCK, NULL, &sigmask);
+       assert(ret == 0);
+       ret = pthread_sigmask(SIG_BLOCK, &sigmask, NULL);
+       assert(ret == 0);
+       }
+#endif
+
 #ifdef CONFIG_PTHREAD_CONDATTR_SETCLOCK
        clock_gettime(CLOCK_MONOTONIC, &ts);
 #else
@@ -163,7 +176,10 @@ static void *helper_thread_main(void *data)
                        FD_SET(hd->pipe[0], &rfds);
                        FD_ZERO(&efds);
                        FD_SET(hd->pipe[0], &efds);
-                       select(1, &rfds, NULL, &efds, &timeout);
+                       ret = select(1, &rfds, NULL, &efds, &timeout);
+                       if (ret < 0)
+                               log_err("fio: select() call in helper thread failed: %s",
+                                       strerror(errno));
                        if (read_from_pipe(hd->pipe[0], &action, sizeof(action)) <
                            0)
                                action = 0;