#include "../fio.h"
#include "../os.h"
-struct net_data {
+struct netio_data {
+ int listenfd;
int send_to_net;
- struct io_u *last_io_u;
+ char host[64];
+ struct sockaddr_in addr;
};
-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;
-}
-
static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
{
- struct net_data *nd = td->io_ops->data;
+ struct netio_data *nd = td->io_ops->data;
struct fio_file *f = io_u->file;
/*
*/
if ((nd->send_to_net && io_u->ddir == DDIR_READ) ||
(!nd->send_to_net && io_u->ddir == DDIR_WRITE)) {
- printf("boo!\n");
- td_verror(td, EINVAL);
+ td_verror(td, EINVAL, "bad direction");
return 1;
}
* If offset is different from last end position, it's a seek.
* As network io is purely sequential, we don't allow seeks.
*/
- td_verror(td, EINVAL);
+ td_verror(td, EINVAL, "cannot seek");
return 1;
}
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;
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
- td_verror(td, io_u->error);
+ if (io_u->error)
+ td_verror(td, io_u->error, "xfer");
- return io_u->error;
+ return FIO_Q_COMPLETED;
}
-static int fio_netio_setup_connect(struct thread_data *td, const char *host,
- unsigned short port)
+static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
{
- struct sockaddr_in addr;
- struct fio_file *f;
- int i;
+ struct netio_data *nd = td->io_ops->data;
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_port = htons(port);
-
- if (inet_aton(host, &addr.sin_addr) != 1) {
- struct hostent *hent;
-
- hent = gethostbyname(host);
- if (!hent) {
- td_verror(td, errno);
- return 1;
- }
-
- memcpy(&addr.sin_addr, hent->h_addr, 4);
+ f->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (f->fd < 0) {
+ td_verror(td, errno, "socket");
+ return 1;
}
- for_each_file(td, f, i) {
- f->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (f->fd < 0) {
- td_verror(td, errno);
- return 1;
- }
-
- if (connect(f->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_verror(td, errno);
- return 1;
- }
+ if (connect(f->fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) {
+ td_verror(td, errno, "connect");
+ return 1;
}
return 0;
-
}
-static int fio_netio_accept_connections(struct thread_data *td, int fd,
- struct sockaddr_in *addr)
+static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
{
- socklen_t socklen = sizeof(*addr);
- unsigned int accepts = 0;
+ struct netio_data *nd = td->io_ops->data;
+ socklen_t socklen = sizeof(nd->addr);
struct pollfd pfd;
+ int ret;
- fprintf(f_out, "fio: waiting for %u connections\n", td->nr_files);
+ fprintf(f_out, "fio: waiting for connection\n");
/*
* 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;
+ while (!td->terminate) {
+ pfd.fd = nd->listenfd;
pfd.events = POLLIN;
ret = poll(&pfd, 1, -1);
if (errno == EINTR)
continue;
- td_verror(td, errno);
+ td_verror(td, errno, "poll");
break;
} else if (!ret)
continue;
if (!(pfd.revents & POLLIN))
continue;
- for_each_file(td, f, i) {
- if (f->fd != -1)
- continue;
+ 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(fd, (struct sockaddr *) addr, &socklen);
- if (f->fd < 0) {
- td_verror(td, errno);
- return 1;
- }
- accepts++;
- break;
+ return 0;
+}
+
+
+static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
+{
+ if (td_read(td))
+ return fio_netio_accept(td, f);
+ else
+ return fio_netio_connect(td, f);
+}
+
+static int fio_netio_setup_connect(struct thread_data *td, const char *host,
+ unsigned short port)
+{
+ struct netio_data *nd = td->io_ops->data;
+
+ nd->addr.sin_family = AF_INET;
+ nd->addr.sin_port = htons(port);
+
+ if (inet_aton(host, &nd->addr.sin_addr) != 1) {
+ struct hostent *hent;
+
+ hent = gethostbyname(host);
+ if (!hent) {
+ td_verror(td, errno, "gethostbyname");
+ return 1;
}
+
+ memcpy(&nd->addr.sin_addr, hent->h_addr, 4);
}
return 0;
}
-static int fio_netio_setup_listen(struct thread_data *td, unsigned short port)
+static int fio_netio_setup_listen(struct thread_data *td, short port)
{
- struct sockaddr_in addr;
+ struct netio_data *nd = td->io_ops->data;
int fd, opt;
fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (fd < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "socket");
return 1;
}
opt = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "setsockopt");
return 1;
}
#ifdef SO_REUSEPORT
if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "setsockopt");
return 1;
}
#endif
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = htonl(INADDR_ANY);
- addr.sin_port = htons(port);
+ nd->addr.sin_family = AF_INET;
+ nd->addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ nd->addr.sin_port = htons(port);
- if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_verror(td, errno);
+ if (bind(fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) {
+ td_verror(td, errno, "bind");
return 1;
}
if (listen(fd, 1) < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "listen");
return 1;
}
- return fio_netio_accept_connections(td, fd, &addr);
+ nd->listenfd = fd;
+ return 0;
}
-static int fio_netio_setup(struct thread_data *td)
+static int fio_netio_init(struct thread_data *td)
{
- char host[64], buf[128];
- struct net_data *nd;
+ struct netio_data *nd = td->io_ops->data;
unsigned short port;
struct fio_file *f;
+ char host[64], buf[128];
char *sep;
int ret, i;
return 1;
}
- /*
- * work around for late init call
- */
- if (td->io_ops->init(td))
- return 1;
-
- nd = td->io_ops->data;
-
- if (td->iomix) {
+ if (td_rw(td)) {
log_err("fio: network connections must be read OR write\n");
return 1;
}
strcpy(host, buf);
port = atoi(sep);
- if (td->ddir == DDIR_READ) {
+ if (td_read(td)) {
nd->send_to_net = 0;
ret = fio_netio_setup_listen(td, port);
} else {
static void fio_netio_cleanup(struct thread_data *td)
{
- if (td->io_ops->data) {
- free(td->io_ops->data);
+ struct netio_data *nd = td->io_ops->data;
+
+ if (nd) {
+ free(nd);
td->io_ops->data = NULL;
}
}
-static int fio_netio_init(struct thread_data *td)
+static int fio_netio_setup(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;
+ struct netio_data *nd = malloc(sizeof(*nd));
- nd = malloc(sizeof(*nd));
- nd->last_io_u = NULL;
+ memset(nd, 0, sizeof(*nd));
+ nd->listenfd = -1;
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,
+ .init = fio_netio_init,
+ .cleanup = fio_netio_cleanup,
+ .open_file = fio_netio_open_file,
+ .close_file = generic_close_file,
+ .flags = FIO_SYNCIO | FIO_DISKLESSIO,
};
static void fio_init fio_netio_register(void)
projects / fio.git / blobdiff