Merge branch 'helper-thread-select' of https://github.com/vincentkfu/fio
authorJens Axboe <axboe@kernel.dk>
Wed, 13 May 2020 14:10:32 +0000 (08:10 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 13 May 2020 14:10:32 +0000 (08:10 -0600)
* 'helper-thread-select' of https://github.com/vincentkfu/fio:
  helper_thread: better handle select() return value

helper_thread.c

index ad1a08f32b6a773e7b4fe83bbc8b1d02bb5e9727..a2fb7c29a0565884e96e9546a6967ee2de889181 100644 (file)
@@ -194,10 +194,11 @@ static void *helper_thread_main(void *data)
                        FD_SET(hd->pipe[0], &rfds);
                        FD_ZERO(&efds);
                        FD_SET(hd->pipe[0], &efds);
-                       ret = select(1, &rfds, NULL, &efds, &timeout);
-                       if (ret < 0)
+                       if (select(1, &rfds, NULL, &efds, &timeout) < 0) {
                                log_err("fio: select() call in helper thread failed: %s",
                                        strerror(errno));
+                               ret = 1;
+                       }
                        if (read_from_pipe(hd->pipe[0], &action, sizeof(action)) <
                            0)
                                action = 0;