From: yoe <yoe>
Date: Mon, 4 Jun 2007 01:01:20 +0000 (+0000)
Subject: r253: Revert r231; it's causing more problems than it attempts to solve
X-Git-Url: http://git.alex.org.uk

r253: Revert r231; it's causing more problems than it attempts to solve
---

diff --git a/nbd-server.c b/nbd-server.c
index 4ba40aa..fd04489 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -295,33 +295,12 @@ int authorized_client(CLIENT *opts) {
  **/
 inline void readit(int f, void *buf, size_t len) {
 	ssize_t res;
-	gboolean tried = FALSE;
-
 	while (len > 0) {
 		DEBUG("*");
-		if ((res = read(f, buf, len)) <= 0) {
-			if(!tried && errno==EAGAIN) {
-				/* Assume the connection will work some time in
-				 * the future, but don't run away with CPU time
-				 * in case it doesn't */
-				fd_set set;
-				struct timeval tv;
-
-				DEBUG("Read failed, trying again");
-				tried=TRUE;
-				FD_ZERO(&set);
-				FD_SET(f, &set);
-				tv.tv_sec=30;
-				tv.tv_usec=0;
-				select(f+1, &set, NULL, NULL, &tv);
-			} else {
-				err("Read failed: %m");
-			}
-		} else {
-			len -= res;
-			buf += res;
-			tried=FALSE;
-		}
+		if ((res = read(f, buf, len)) <= 0)
+			err("Read failed: %m");
+		len -= res;
+		buf += res;
 	}
 }
 
@@ -334,33 +313,12 @@ inline void readit(int f, void *buf, size_t len) {
  **/
 inline void writeit(int f, void *buf, size_t len) {
 	ssize_t res;
-	gboolean tried=FALSE;
-
 	while (len > 0) {
 		DEBUG("+");
-		if ((res = write(f, buf, len)) <= 0) {
-			if(!tried && errno==EAGAIN) {
-				/* Assume the connection will work some time in
-				 * the future, but don't run away with CPU time
-				 * in case it doesn't */
-				fd_set set;
-				struct timeval tv;
-
-				DEBUG("Write failed, trying again");
-				tried=TRUE;
-				FD_ZERO(&set);
-				FD_SET(f, &set);
-				tv.tv_sec=30;
-				tv.tv_usec=0;
-				select(f+1, NULL, &set, NULL, &tv);
-			} else {
-				err("Send failed: %m");
-			}
-		} else {
-			len -= res;
-			buf += res;
-			tried=FALSE;
-		}
+		if ((res = write(f, buf, len)) <= 0)
+			err("Send failed: %m");
+		len -= res;
+		buf += res;
 	}
 }
 
@@ -1379,7 +1337,7 @@ void setup_serve(SERVER *serve) {
 		err("fcntl F_GETFL");
 	}
 	if (fcntl(serve->socket, F_SETFL, sock_flags | O_NONBLOCK) == -1) {
-		err("fcntl F_SETFL O_NONBLOCK on server socket");
+		err("fcntl F_SETFL O_NONBLOCK");
 	}
 
 	DEBUG("Waiting for connections... bind, ");
@@ -1456,20 +1414,12 @@ int serveloop(GArray* servers) {
 			for(i=0;i<servers->len;i++) {
 				serve=&(g_array_index(servers, SERVER, i));
 				if(FD_ISSET(serve->socket, &rset)) {
-					int sock_flags;
-
 					if ((net=accept(serve->socket, (struct sockaddr *) &addrin, &addrinlen)) < 0)
 						err("accept: %m");
 
 					client = g_malloc(sizeof(CLIENT));
 					client->server=serve;
 					client->exportsize=OFFT_MAX;
-					if ((sock_flags = fcntl(serve->socket, F_GETFL, 0)) == -1) {
-						err("fcntl F_GETFL");
-					}
-					if (fcntl(net, F_SETFL, sock_flags | O_NONBLOCK) == -1) {
-						err("fcntl F_SETFL O_NONBLOCK on client socket");
-					}
 					client->net=net;
 					set_peername(net, client);
 					if (!authorized_client(client)) {