From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 5 Oct 2011 20:05:37 +0000 (+0200)
Subject: server: quit on !block and backend exit
X-Git-Tag: fio-1.99.1~1
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=19c65179fad3e0a32a450401ba7d312169627fdd

server: quit on !block and backend exit

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/server.c b/server.c
index 2aff0625..6f216d5d 100644
--- a/server.c
+++ b/server.c
@@ -358,8 +358,11 @@ static int handle_connection(int sk, int block)
 					break;
 				log_err("fio: poll: %s\n", strerror(errno));
 				break;
-			} else if (!ret)
+			} else if (!ret) {
+				if (!block)
+					return 0;
 				continue;
+			}
 
 			if (pfd.revents & POLLIN)
 				break;
@@ -367,7 +370,7 @@ static int handle_connection(int sk, int block)
 				ret = 1;
 				break;
 			}
-		} while (1);
+		} while (!exit_backend);
 
 		if (ret < 0)
 			break;