/*
- * 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 {
- int send_to_net;
- struct io_u *last_io_u;
-};
-
-static int fio_netio_getevents(struct thread_data *td, int fio_unused min,
- int max, struct timespec fio_unused *t)
-{
- assert(max <= 1);
-
- /*
- * we can only have one finished io_u for sync io, since the depth
- * is always 1
- */
- if (list_empty(&td->io_u_busylist))
- return 0;
-
- return 1;
-}
-
-static struct io_u *fio_netio_event(struct thread_data *td, int event)
-{
- struct net_data *nd = td->io_ops->data;
-
- assert(event == 0);
-
- return nd->last_io_u;
-}
+#define send_to_net(td) ((td)->io_ops->priv)
static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
{
- struct net_data *nd = td->io_ops->data;
struct fio_file *f = io_u->file;
- if (nd->send_to_net) {
- if (io_u->ddir == DDIR_READ) {
- td_verror(td, EINVAL);
- return 1;
- }
- } else {
- if (io_u->ddir == DDIR_WRITE) {
- td_verror(td, EINVAL);
- return 1;
- }
+ /*
+ * Make sure we don't see spurious reads to a receiver, and vice versa
+ */
+ if ((send_to_net(td) && io_u->ddir == DDIR_READ) ||
+ (!send_to_net(td) && io_u->ddir == DDIR_WRITE)) {
+ td_verror(td, EINVAL);
+ return 1;
}
-
+
if (io_u->ddir == DDIR_SYNC)
return 0;
if (io_u->offset == f->last_completed_pos)
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;
- unsigned int ret = 0;
-
- if (io_u->ddir == DDIR_WRITE)
- ret = write(f->fd, io_u->buf, io_u->buflen);
- else if (io_u->ddir == DDIR_READ)
- ret = read(f->fd, io_u->buf, io_u->buflen);
-
- if (ret != io_u->buflen) {
+ int ret, flags = 0;
+
+ if (io_u->ddir == DDIR_WRITE) {
+ /*
+ * if we are going to write more, set MSG_MORE
+ */
+ if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
+ td->io_size)
+ flags = MSG_MORE;
+
+ ret = send(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
+ } 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 (ret > 0) {
- io_u->resid = io_u->buflen - ret;
- io_u->error = EIO;
+ io_u->resid = io_u->xfer_buflen - ret;
+ io_u->error = 0;
+ return FIO_Q_COMPLETED;
} else
io_u->error = errno;
}
- if (!io_u->error)
- nd->last_io_u = io_u;
+ if (io_u->error)
+ td_verror(td, io_u->error);
- return io_u->error;
+ return FIO_Q_COMPLETED;
}
static int fio_netio_setup_connect(struct thread_data *td, const char *host,
addr.sin_port = htons(port);
if (inet_aton(host, &addr.sin_addr) != 1) {
- struct hostent *hent = gethostbyname(host);
+ struct hostent *hent;
+ 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)
{
char host[64], buf[128];
- struct net_data *nd;
unsigned short port;
struct fio_file *f;
char *sep;
int ret, i;
- /*
- * work around for late init call
- */
- if (td->io_ops->init(td))
+ if (!td->total_file_size) {
+ log_err("fio: need size= set\n");
return 1;
-
- nd = td->io_ops->data;
+ }
if (td->iomix) {
log_err("fio: network connections must be read OR write\n");
strcpy(host, buf);
port = atoi(sep);
- if (td->ddir == READ) {
- nd->send_to_net = 0;
+ if (td->ddir == DDIR_READ) {
+ send_to_net(td) = 0;
ret = fio_netio_setup_listen(td, port);
} else {
- nd->send_to_net = 1;
+ send_to_net(td) = 1;
ret = fio_netio_setup_connect(td, host, port);
}
return 0;
}
-static void fio_netio_cleanup(struct thread_data *td)
-{
- if (td->io_ops->data) {
- free(td->io_ops->data);
- td->io_ops->data = NULL;
- }
-}
-
-static int fio_netio_init(struct thread_data *td)
-{
- struct net_data *nd;
-
- /*
- * Hack to work-around the ->setup() function calling init on its
- * own, since it needs ->io_ops->data to be set up.
- */
- if (td->io_ops->data)
- return 0;
-
- nd = malloc(sizeof(*nd));
- nd->last_io_u = NULL;
- td->io_ops->data = nd;
- return 0;
-}
-
static struct ioengine_ops ioengine = {
.name = "net",
.version = FIO_IOOPS_VERSION,
- .init = fio_netio_init,
.prep = fio_netio_prep,
.queue = fio_netio_queue,
- .getevents = fio_netio_getevents,
- .event = fio_netio_event,
- .cleanup = fio_netio_cleanup,
.setup = fio_netio_setup,
.flags = FIO_SYNCIO | FIO_NETIO,
};
projects / fio.git / blobdiff