X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fnet.c;h=4ddacf28b1343e726ad2a860ff5facc308108d3c;hb=306ddc9752eef70c3fbb111af63d197a3a6d447f;hp=2a9caaa24e8985172fd89764c190fba67c415674;hpb=414c2a3e741bb7dd7147ce6843f529c7773cea38;p=fio.git

diff --git a/engines/net.c b/engines/net.c
index 2a9caaa2..4ddacf28 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -28,6 +28,47 @@ struct netio_data {
 	struct sockaddr_in addr;
 };
 
+struct udp_close_msg {
+	uint32_t magic;
+	uint32_t cmd;
+};
+
+enum {
+	FIO_LINK_CLOSE = 0x89,
+	FIO_LINK_CLOSE_MAGIC = 0x6c696e6b,
+};
+
+/*
+ * Return -1 for error and 'nr events' for a positive number
+ * of events
+ */
+static int poll_wait(struct thread_data *td, int fd, short events)
+{
+	struct pollfd pfd;
+	int ret;
+
+	while (!td->terminate) {
+		pfd.fd = fd;
+		pfd.events = events;
+		ret = poll(&pfd, 1, -1);
+		if (ret < 0) {
+			if (errno == EINTR)
+				break;
+
+			td_verror(td, errno, "poll");
+			return -1;
+		} else if (!ret)
+			continue;
+
+		break;
+	}
+
+	if (pfd.revents & events)
+		return 1;
+
+	return -1;
+}
+
 static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
 {
 	struct netio_data *nd = td->io_ops->data;
@@ -182,39 +223,87 @@ static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
 static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
 {
 	struct netio_data *nd = td->io_ops->data;
-	int flags = 0;
+	int ret, flags = MSG_DONTWAIT;
 
-	/*
-	 * if we are going to write more, set MSG_MORE
-	 */
+	do {
+		if (nd->net_protocol == IPPROTO_UDP) {
+			struct sockaddr *to = (struct sockaddr *) &nd->addr;
+
+			ret = sendto(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags, to,
+					sizeof(*to));
+		} else {
+			/*
+			 * if we are going to write more, set MSG_MORE
+			 */
 #ifdef MSG_MORE
-	if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen < td->o.size)
-		flags = MSG_MORE;
+			if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
+			    td->o.size)
+				flags |= MSG_MORE;
 #endif
+			ret = send(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags);
+		}
+		if (ret > 0)
+			break;
 
-	if (nd->net_protocol == IPPROTO_UDP) {
-		return sendto(io_u->file->fd, io_u->xfer_buf, io_u->xfer_buflen,
-				0, &nd->addr, sizeof(nd->addr));
-	} else {
-		return send(io_u->file->fd, io_u->xfer_buf, io_u->xfer_buflen,
-				flags);
-	}
+		ret = poll_wait(td, io_u->file->fd, POLLOUT);
+		if (ret <= 0)
+			break;
+
+		flags &= ~MSG_DONTWAIT;
+	} while (1);
+
+	return ret;
+}
+
+static int is_udp_close(struct io_u *io_u, int len)
+{
+	struct udp_close_msg *msg;
+
+	if (len != sizeof(struct udp_close_msg))
+		return 0;
+
+	msg = io_u->xfer_buf;
+	if (ntohl(msg->magic) != FIO_LINK_CLOSE_MAGIC)
+		return 0;
+	if (ntohl(msg->cmd) != FIO_LINK_CLOSE)
+		return 0;
+
+	return 1;
 }
 
 static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
 {
 	struct netio_data *nd = td->io_ops->data;
-	int flags = MSG_WAITALL;
+	int ret, flags = MSG_DONTWAIT;
+
+	do {
+		if (nd->net_protocol == IPPROTO_UDP) {
+			socklen_t len = sizeof(nd->addr);
+			struct sockaddr *from = (struct sockaddr *) &nd->addr;
+
+			ret = recvfrom(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags, from, &len);
+			if (is_udp_close(io_u, ret)) {
+				td->done = 1;
+				return 0;
+			}
+		} else {
+			ret = recv(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags);
+		}
+		if (ret > 0)
+			break;
 
-	if (nd->net_protocol == IPPROTO_UDP) {
-		socklen_t len = sizeof(nd->addr);
+		ret = poll_wait(td, io_u->file->fd, POLLIN);
+		if (ret <= 0)
+			break;
+		flags &= ~MSG_DONTWAIT;
+		flags |= MSG_WAITALL;
+	} while (1);
 
-		return recvfrom(io_u->file->fd, io_u->xfer_buf,
-				io_u->xfer_buflen, 0, &nd->addr, &len);
-	} else {
-		return recv(io_u->file->fd, io_u->xfer_buf, io_u->xfer_buflen,
-				flags);
-	}
+	return ret;
 }
 
 static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
@@ -289,8 +378,6 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
 {
 	struct netio_data *nd = td->io_ops->data;
 	socklen_t socklen = sizeof(nd->addr);
-	struct pollfd pfd;
-	int ret;
 
 	if (nd->net_protocol == IPPROTO_UDP) {
 		f->fd = nd->listenfd;
@@ -299,36 +386,13 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
 
 	log_info("fio: waiting for connection\n");
 
-	/*
-	 * Accept loop. poll for incoming events, accept them. Repeat until we
-	 * have all connections.
-	 */
-	while (!td->terminate) {
-		pfd.fd = nd->listenfd;
-		pfd.events = POLLIN;
-
-		ret = poll(&pfd, 1, -1);
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
-
-			td_verror(td, errno, "poll");
-			break;
-		} else if (!ret)
-			continue;
-
-		/*
-		 * should be impossible
-		 */
-		if (!(pfd.revents & POLLIN))
-			continue;
+	if (poll_wait(td, nd->listenfd, POLLIN) < 0)
+		return 1;
 
-		f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
-		if (f->fd < 0) {
-			td_verror(td, errno, "accept");
-			return 1;
-		}
-		break;
+	f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
+	if (f->fd < 0) {
+		td_verror(td, errno, "accept");
+		return 1;
 	}
 
 	return 0;
@@ -342,6 +406,36 @@ static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
 		return fio_netio_connect(td, f);
 }
 
+static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct udp_close_msg msg;
+	struct sockaddr *to = (struct sockaddr *) &nd->addr;
+	int ret;
+
+	msg.magic = htonl(FIO_LINK_CLOSE_MAGIC);
+	msg.cmd = htonl(FIO_LINK_CLOSE);
+
+	ret = sendto(f->fd, &msg, sizeof(msg), MSG_WAITALL, to,
+			sizeof(nd->addr));
+	if (ret < 0)
+		td_verror(td, errno, "sendto udp link close");
+}
+
+static int fio_netio_close_file(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_data *nd = td->io_ops->data;
+
+	/*
+	 * If this is an UDP connection, notify the receiver that we are
+	 * closing down the link
+	 */
+	if (nd->net_protocol == IPPROTO_UDP)
+		fio_netio_udp_close(td, f);
+
+	return generic_close_file(td, f);
+}
+
 static int fio_netio_setup_connect(struct thread_data *td, const char *host,
 				   unsigned short port)
 {
@@ -452,9 +546,11 @@ static int fio_netio_init(struct thread_data *td)
 		goto bad_host;
 
 	if (modep) {
-		if (!strncmp("tcp", modep, strlen(modep)))
+		if (!strncmp("tcp", modep, strlen(modep)) ||
+		    !strncmp("TCP", modep, strlen(modep)))
 			nd->net_protocol = IPPROTO_TCP;
-		else if (!strncmp("udp", modep, strlen(modep)))
+		else if (!strncmp("udp", modep, strlen(modep)) ||
+			 !strncmp("UDP", modep, strlen(modep)))
 			nd->net_protocol = IPPROTO_UDP;
 		else
 			goto bad_host;
@@ -550,7 +646,7 @@ static struct ioengine_ops ioengine_rw = {
 	.init		= fio_netio_init,
 	.cleanup	= fio_netio_cleanup,
 	.open_file	= fio_netio_open_file,
-	.close_file	= generic_close_file,
+	.close_file	= fio_netio_close_file,
 	.flags		= FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
 			  FIO_SIGQUIT,
 };