/*
- * 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>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <sys/poll.h>
#include "../fio.h"
#include "../os.h"
{
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
*/
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) {
if (!io_u->error)
nd->last_io_u = io_u;
+ else
+ td_verror(td, io_u->error);
return io_u->error;
}
hent = gethostbyname(host);
if (!hent) {
- td_vmsg(td, errno, "gethostbyname");
+ td_verror(td, errno);
return 1;
}
}
for_each_file(td, f, i) {
- f->fd = socket(AF_INET, SOCK_STREAM, 0);
+ f->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (f->fd < 0) {
- td_vmsg(td, errno, "socket");
+ td_verror(td, errno);
return 1;
}
if (connect(f->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_vmsg(td, errno, "connect");
+ td_verror(td, errno);
return 1;
}
}
}
+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, 0);
+ fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (fd < 0) {
- td_vmsg(td, errno, "socket");
+ td_verror(td, errno);
return 1;
}
opt = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
- td_vmsg(td, errno, "setsockopt");
+ td_verror(td, errno);
+ return 1;
+ }
+#ifdef SO_REUSEPORT
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+ td_verror(td, errno);
return 1;
}
+#endif
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_vmsg(td, errno, "bind");
+ td_verror(td, errno);
return 1;
}
if (listen(fd, 1) < 0) {
- td_vmsg(td, errno, "listen");
+ td_verror(td, errno);
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_vmsg(td, errno, "accept");
- return 1;
- }
- }
-
- return 0;
+ return fio_netio_accept_connections(td, fd, &addr);
}
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 {