Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message May 14, 2020

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 9bc878ed59deb6c4a031f4f3a8d1ff3bbdbbd14d:

Merge branch 'btrace2fio' of https://github.com/liu-song-6/fio (2020-05-11 12:09:31 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 3ac77f9f5f7e3f2a5f9dababae810565f4c72eb7:

Merge branch 'helper-thread-select' of https://github.com/vincentkfu/fio (2020-05-13 08:10:32 -0600)

----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'helper-thread-select' of https://github.com/vincentkfu/fio

Vincent Fu (1):
helper_thread: better handle select() return value

 helper_thread.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

---

Diff of recent changes:

helper_thread.c +3 -2
index ad1a08f3..a2fb7c29 100644
@@ -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;