X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnet.c;h=02314515d4f70866c886bc792a54fdd54fc3b522;hp=3967959f27953b4c72c28bc64d30a7758d0db6a6;hb=a2e1b08afa641078832d69871ae5e404db3e4fc1;hpb=6bedbfafcffbc7202b5bb621ac5886aafdc0f362;ds=sidebyside

diff --git a/engines/net.c b/engines/net.c
index 3967959f..02314515 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -1,6 +1,5 @@
 /*
- * Transfer data over the net. Pretty basic setup, will only support
- * 1 file per thread/job.
+ * Transfer data over the net.
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,6 +9,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/poll.h>
 
 #include "../fio.h"
 #include "../os.h"
@@ -75,11 +75,9 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 {
 	struct net_data *nd = td->io_ops->data;
 	struct fio_file *f = io_u->file;
-	int ret;
+	int ret, flags = 0;
 
 	if (io_u->ddir == DDIR_WRITE) {
-		int flags = 0;
-
 		/*
 		 * if we are going to write more, set MSG_MORE
 		 */
@@ -88,9 +86,10 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 			flags = MSG_MORE;
 
 		ret = send(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
-	} else if (io_u->ddir == DDIR_READ)
-		ret = recv(f->fd, io_u->xfer_buf, io_u->xfer_buflen, MSG_WAITALL);
-	else
+	} else if (io_u->ddir == DDIR_READ) {
+		flags = MSG_WAITALL;
+		ret = recv(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
+	} else
 		ret = 0;	/* must be a SYNC */
 
 	if (ret != (int) io_u->xfer_buflen) {
@@ -104,6 +103,8 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 
 	if (!io_u->error)
 		nd->last_io_u = io_u;
+	else
+		td_verror(td, io_u->error);
 
 	return io_u->error;
 }
@@ -148,12 +149,63 @@ static int fio_netio_setup_connect(struct thread_data *td, const char *host,
 
 }
 
+static int fio_netio_accept_connections(struct thread_data *td, int fd,
+					struct sockaddr_in *addr)
+{
+	socklen_t socklen = sizeof(*addr);
+	unsigned int accepts = 0;
+	struct pollfd pfd;
+
+	fprintf(f_out, "fio: waiting for %u connections\n", td->nr_files);
+
+	/*
+	 * Accept loop. poll for incoming events, accept them. Repeat until we
+	 * have all connections.
+	 */
+	while (!td->terminate && accepts < td->nr_files) {
+		struct fio_file *f;
+		int ret, i;
+
+		pfd.fd = fd;
+		pfd.events = POLLIN;
+
+		ret = poll(&pfd, 1, -1);
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+
+			td_verror(td, errno);
+			break;
+		} else if (!ret)
+			continue;
+
+		/*
+		 * should be impossible
+		 */
+		if (!(pfd.revents & POLLIN))
+			continue;
+
+		for_each_file(td, f, i) {
+			if (f->fd != -1)
+				continue;
+
+			f->fd = accept(fd, (struct sockaddr *) addr, &socklen);
+			if (f->fd < 0) {
+				td_verror(td, errno);
+				return 1;
+			}
+			accepts++;
+			break;
+		}
+	}
+
+	return 0;
+}
+
 static int fio_netio_setup_listen(struct thread_data *td, unsigned short port)
 {
 	struct sockaddr_in addr;
-	socklen_t socklen;
-	struct fio_file *f;
-	int fd, opt, i;
+	int fd, opt;
 
 	fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (fd < 0) {
@@ -187,18 +239,7 @@ static int fio_netio_setup_listen(struct thread_data *td, unsigned short port)
 		return 1;
 	}
 
-	fprintf(f_out, "fio: waiting for %u connections\n", td->nr_files);
-
-	socklen = sizeof(addr);
-	for_each_file(td, f, i) {
-		f->fd = accept(fd, (struct sockaddr *) &addr, &socklen);
-		if (f->fd < 0) {
-			td_verror(td, errno);
-			return 1;
-		}
-	}
-
-	return 0;
+	return fio_netio_accept_connections(td, fd, &addr);
 }
 
 static int fio_netio_setup(struct thread_data *td)
@@ -241,7 +282,7 @@ static int fio_netio_setup(struct thread_data *td)
 	strcpy(host, buf);
 	port = atoi(sep);
 
-	if (td->ddir == READ) {
+	if (td->ddir == DDIR_READ) {
 		nd->send_to_net = 0;
 		ret = fio_netio_setup_listen(td, port);
 	} else {