X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnet.c;h=381c731c9bf3892c9261aabcb45bf0d5812f21a2;hp=fe114a7b8c8fab5b69a8d9b508580f292a8732fb;hb=145dad6d3e1ae4bf44dd49eea9d0c025500b97d0;hpb=95bcd815e5ce55d6cdd8eb83bda5ee411f37bdc9 diff --git a/engines/net.c b/engines/net.c index fe114a7b..381c731c 100644 --- a/engines/net.c +++ b/engines/net.c @@ -9,50 +9,22 @@ #include #include #include +#include #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; /* * Make sure we don't see spurious reads to a receiver, and vice versa */ - if ((nd->send_to_net && io_u->ddir == DDIR_READ) || - (!nd->send_to_net && io_u->ddir == DDIR_WRITE)) { - printf("boo!\n"); + 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; } @@ -72,7 +44,6 @@ static int fio_netio_prep(struct thread_data *td, struct io_u *io_u) 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, flags = 0; @@ -92,20 +63,18 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u) ret = 0; /* must be a SYNC */ if (ret != (int) io_u->xfer_buflen) { - if (ret > 0) { + if (ret >= 0) { io_u->resid = io_u->xfer_buflen - ret; io_u->error = 0; - return ret; + return FIO_Q_COMPLETED; } else io_u->error = errno; } - if (!io_u->error) - nd->last_io_u = io_u; - else + 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, @@ -148,12 +117,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,24 +207,12 @@ 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) { char host[64], buf[128]; - struct net_data *nd; unsigned short port; struct fio_file *f; char *sep; @@ -215,14 +223,6 @@ static int fio_netio_setup(struct thread_data *td) return 1; } - /* - * work around for late init call - */ - if (td->io_ops->init(td)) - return 1; - - nd = td->io_ops->data; - if (td->iomix) { log_err("fio: network connections must be read OR write\n"); return 1; @@ -242,10 +242,10 @@ static int fio_netio_setup(struct thread_data *td) port = atoi(sep); if (td->ddir == DDIR_READ) { - nd->send_to_net = 0; + 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); } @@ -263,40 +263,11 @@ static int fio_netio_setup(struct thread_data *td) 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, };