From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 19 Jan 2009 11:38:27 +0000 (+0100)
Subject: net engine: termination fixes
X-Git-Tag: fio-1.24~4
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=d5b388a560783a61af7b424757bc6dead2309c28

net engine: termination fixes

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/engines/net.c b/engines/net.c
index afb3265c..700f1626 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -43,7 +43,7 @@ static int poll_wait(struct thread_data *td, int fd, short events)
 		ret = poll(&pfd, 1, -1);
 		if (ret < 0) {
 			if (errno == EINTR)
-				continue;
+				break;
 
 			td_verror(td, errno, "poll");
 			return -1;
@@ -55,8 +55,6 @@ static int poll_wait(struct thread_data *td, int fd, short events)
 
 	if (pfd.revents & events)
 		return 1;
-	else if (td->terminate)
-		return 1;
 
 	return -1;
 }