#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <signal.h>
#include <errno.h>
#include <assert.h>
#include <netinet/in.h>
+#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/poll.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/socket.h>
+#include <sys/un.h>
#include "../fio.h"
struct netio_data {
int listenfd;
- int send_to_net;
int use_splice;
- int net_protocol;
int pipes[2];
- char host[64];
struct sockaddr_in addr;
+ struct sockaddr_un addr_un;
+};
+
+struct netio_options {
+ struct thread_data *td;
+ unsigned int port;
+ unsigned int proto;
+ unsigned int listen;
+ unsigned int pingpong;
+ unsigned int nodelay;
};
struct udp_close_msg {
enum {
FIO_LINK_CLOSE = 0x89,
- FIO_LINK_CLOSE_MAGIC = 0x6c696e6b,
+ FIO_LINK_OPEN_CLOSE_MAGIC = 0x6c696e6b,
+ FIO_LINK_OPEN = 0x98,
+
+ FIO_TYPE_TCP = 1,
+ FIO_TYPE_UDP = 2,
+ FIO_TYPE_UNIX = 3,
+};
+
+static int str_hostname_cb(void *data, const char *input);
+static struct fio_option options[] = {
+ {
+ .name = "hostname",
+ .type = FIO_OPT_STR_STORE,
+ .cb = str_hostname_cb,
+ .help = "Hostname for net IO engine",
+ },
+ {
+ .name = "port",
+ .type = FIO_OPT_INT,
+ .off1 = offsetof(struct netio_options, port),
+ .minval = 1,
+ .maxval = 65535,
+ .help = "Port to use for TCP or UDP net connections",
+ },
+ {
+ .name = "protocol",
+ .alias = "proto",
+ .type = FIO_OPT_STR,
+ .off1 = offsetof(struct netio_options, proto),
+ .help = "Network protocol to use",
+ .def = "tcp",
+ .posval = {
+ { .ival = "tcp",
+ .oval = FIO_TYPE_TCP,
+ .help = "Transmission Control Protocol",
+ },
+ { .ival = "udp",
+ .oval = FIO_TYPE_UDP,
+ .help = "User Datagram Protocol",
+ },
+ { .ival = "unix",
+ .oval = FIO_TYPE_UNIX,
+ .help = "UNIX domain socket",
+ },
+ },
+ },
+#ifdef CONFIG_TCP_NODELAY
+ {
+ .name = "nodelay",
+ .type = FIO_OPT_BOOL,
+ .off1 = offsetof(struct netio_options, nodelay),
+ .help = "Use TCP_NODELAY on TCP connections",
+ },
+#endif
+ {
+ .name = "listen",
+ .type = FIO_OPT_STR_SET,
+ .off1 = offsetof(struct netio_options, listen),
+ .help = "Listen for incoming TCP connections",
+ },
+ {
+ .name = "pingpong",
+ .type = FIO_OPT_STR_SET,
+ .off1 = offsetof(struct netio_options, pingpong),
+ .help = "Ping-pong IO requests",
+ },
+ {
+ .name = NULL,
+ },
};
/*
static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
{
- struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
/*
* 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)) {
+ if (o->proto == FIO_TYPE_TCP)
+ return 0;
+
+ if ((o->listen && io_u->ddir == DDIR_WRITE) ||
+ (!o->listen && io_u->ddir == DDIR_READ)) {
td_verror(td, EINVAL, "bad direction");
return 1;
}
-
+
return 0;
}
-#ifdef FIO_HAVE_SPLICE
+#ifdef CONFIG_LINUX_SPLICE
static int splice_io_u(int fdin, int fdout, unsigned int len)
{
int bytes = 0;
static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
int ret, flags = 0;
-#ifdef MSG_DONTWAIT
- flags = MSG_DONTWAIT;
-#endif
do {
- if (nd->net_protocol == IPPROTO_UDP) {
+ if (o->proto == FIO_TYPE_UDP) {
struct sockaddr *to = (struct sockaddr *) &nd->addr;
ret = sendto(io_u->file->fd, io_u->xfer_buf,
* 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)
+ if ((td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
+ td->o.size) && !o->pingpong)
flags |= MSG_MORE;
#endif
ret = send(io_u->file->fd, io_u->xfer_buf,
ret = poll_wait(td, io_u->file->fd, POLLOUT);
if (ret <= 0)
break;
-
-#ifdef MSG_DONTWAIT
- flags &= ~MSG_DONTWAIT;
-#endif
} while (1);
return ret;
return 0;
msg = io_u->xfer_buf;
- if (ntohl(msg->magic) != FIO_LINK_CLOSE_MAGIC)
+ if (ntohl(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC)
return 0;
if (ntohl(msg->cmd) != FIO_LINK_CLOSE)
return 0;
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
int ret, flags = 0;
-#ifdef MSG_DONTWAIT
- flags = MSG_DONTWAIT;
-#endif
do {
- if (nd->net_protocol == IPPROTO_UDP) {
+ if (o->proto == FIO_TYPE_UDP) {
socklen_t len = sizeof(nd->addr);
struct sockaddr *from = (struct sockaddr *) &nd->addr;
}
if (ret > 0)
break;
+ else if (!ret && (flags & MSG_WAITALL))
+ break;
ret = poll_wait(td, io_u->file->fd, POLLIN);
if (ret <= 0)
break;
-#ifdef MSG_DONTWAIT
- flags &= ~MSG_DONTWAIT;
-#endif
flags |= MSG_WAITALL;
} while (1);
return ret;
}
-static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
+ enum fio_ddir ddir)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
int ret;
- fio_ro_check(td, io_u);
-
- if (io_u->ddir == DDIR_WRITE) {
- if (!nd->use_splice || nd->net_protocol == IPPROTO_UDP)
+ if (ddir == DDIR_WRITE) {
+ if (!nd->use_splice || o->proto == FIO_TYPE_UDP ||
+ o->proto == FIO_TYPE_UNIX)
ret = fio_netio_send(td, io_u);
else
ret = fio_netio_splice_out(td, io_u);
- } else if (io_u->ddir == DDIR_READ) {
- if (!nd->use_splice || nd->net_protocol == IPPROTO_UDP)
+ } else if (ddir == DDIR_READ) {
+ if (!nd->use_splice || o->proto == FIO_TYPE_UDP ||
+ o->proto == FIO_TYPE_UNIX)
ret = fio_netio_recv(td, io_u);
else
ret = fio_netio_splice_in(td, io_u);
} else {
int err = errno;
- if (io_u->ddir == DDIR_WRITE && err == EMSGSIZE)
+ if (ddir == DDIR_WRITE && err == EMSGSIZE)
return FIO_Q_BUSY;
io_u->error = err;
return FIO_Q_COMPLETED;
}
+static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+{
+ struct netio_options *o = td->eo;
+ int ret;
+
+ fio_ro_check(td, io_u);
+
+ ret = __fio_netio_queue(td, io_u, io_u->ddir);
+ if (!o->pingpong || ret != FIO_Q_COMPLETED)
+ return ret;
+
+ /*
+ * For ping-pong mode, receive or send reply as needed
+ */
+ if (td_read(td) && io_u->ddir == DDIR_READ)
+ ret = __fio_netio_queue(td, io_u, DDIR_WRITE);
+ else if (td_write(td) && io_u->ddir == DDIR_WRITE)
+ ret = __fio_netio_queue(td, io_u, DDIR_READ);
+
+ return ret;
+}
+
static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
{
struct netio_data *nd = td->io_ops->data;
- int type;
+ struct netio_options *o = td->eo;
+ int type, domain;
- if (nd->net_protocol == IPPROTO_TCP)
+ if (o->proto == FIO_TYPE_TCP) {
+ domain = AF_INET;
type = SOCK_STREAM;
- else
+ } else if (o->proto == FIO_TYPE_UDP) {
+ domain = AF_INET;
type = SOCK_DGRAM;
+ } else if (o->proto == FIO_TYPE_UNIX) {
+ domain = AF_UNIX;
+ type = SOCK_STREAM;
+ } else {
+ log_err("fio: bad network type %d\n", o->proto);
+ f->fd = -1;
+ return 1;
+ }
- f->fd = socket(AF_INET, type, nd->net_protocol);
+ f->fd = socket(domain, type, 0);
if (f->fd < 0) {
td_verror(td, errno, "socket");
return 1;
}
- if (nd->net_protocol == IPPROTO_UDP)
+#ifdef CONFIG_TCP_NODELAY
+ if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+ int optval = 1;
+
+ if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
+ log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno));
+ return 1;
+ }
+ }
+#endif
+
+ if (o->proto == FIO_TYPE_UDP)
return 0;
+ else if (o->proto == FIO_TYPE_TCP) {
+ socklen_t len = sizeof(nd->addr);
- if (connect(f->fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) {
- td_verror(td, errno, "connect");
- return 1;
+ if (connect(f->fd, (struct sockaddr *) &nd->addr, len) < 0) {
+ td_verror(td, errno, "connect");
+ close(f->fd);
+ return 1;
+ }
+ } else {
+ struct sockaddr_un *addr = &nd->addr_un;
+ socklen_t len;
+
+ len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1;
+
+ if (connect(f->fd, (struct sockaddr *) addr, len) < 0) {
+ td_verror(td, errno, "connect");
+ close(f->fd);
+ return 1;
+ }
}
return 0;
static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
socklen_t socklen = sizeof(nd->addr);
+ int state;
- if (nd->net_protocol == IPPROTO_UDP) {
+ if (o->proto == FIO_TYPE_UDP) {
f->fd = nd->listenfd;
return 0;
}
+ state = td->runstate;
+ td_set_runstate(td, TD_SETTING_UP);
+
log_info("fio: waiting for connection\n");
if (poll_wait(td, nd->listenfd, POLLIN) < 0)
- return 1;
+ goto err;
f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
if (f->fd < 0) {
td_verror(td, errno, "accept");
- return 1;
+ goto err;
}
- return 0;
-}
+#ifdef CONFIG_TCP_NODELAY
+ if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+ int optval = 1;
-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);
+ if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
+ log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno));
+ return 1;
+ }
+ }
+#endif
+
+ reset_all_stats(td);
+ td_set_runstate(td, state);
+ return 0;
+err:
+ td_set_runstate(td, state);
+ return 1;
}
static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
struct sockaddr *to = (struct sockaddr *) &nd->addr;
int ret;
- msg.magic = htonl(FIO_LINK_CLOSE_MAGIC);
+ msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC);
msg.cmd = htonl(FIO_LINK_CLOSE);
- ret = sendto(f->fd, &msg, sizeof(msg), MSG_WAITALL, to,
+ ret = sendto(f->fd, (void *) &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;
+ struct netio_options *o = td->eo;
/*
* If this is an UDP connection, notify the receiver that we are
* closing down the link
*/
- if (nd->net_protocol == IPPROTO_UDP)
+ if (o->proto == FIO_TYPE_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)
+static int fio_netio_udp_recv_open(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;
+ socklen_t len = sizeof(nd->addr);
+ int ret;
+
+ ret = recvfrom(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, &len);
+ if (ret < 0) {
+ td_verror(td, errno, "sendto udp link open");
+ return ret;
+ }
+
+ if (ntohl(msg.magic) != FIO_LINK_OPEN_CLOSE_MAGIC ||
+ ntohl(msg.cmd) != FIO_LINK_OPEN) {
+ log_err("fio: bad udp open magic %x/%x\n", ntohl(msg.magic),
+ ntohl(msg.cmd));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int fio_netio_udp_send_open(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_OPEN_CLOSE_MAGIC);
+ msg.cmd = htonl(FIO_LINK_OPEN);
+
+ ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to,
+ sizeof(nd->addr));
+ if (ret < 0) {
+ td_verror(td, errno, "sendto udp link open");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
+{
+ int ret;
+ struct netio_options *o = td->eo;
+
+ if (o->listen)
+ ret = fio_netio_accept(td, f);
+ else
+ ret = fio_netio_connect(td, f);
+
+ if (ret) {
+ f->fd = -1;
+ return ret;
+ }
+
+ if (o->proto == FIO_TYPE_UDP) {
+ if (td_write(td))
+ ret = fio_netio_udp_send_open(td, f);
+ else {
+ int state;
+
+ state = td->runstate;
+ td_set_runstate(td, TD_SETTING_UP);
+ ret = fio_netio_udp_recv_open(td, f);
+ td_set_runstate(td, state);
+ }
+ }
+
+ if (ret)
+ fio_netio_close_file(td, f);
+
+ return ret;
+}
+
+static int fio_netio_setup_connect_inet(struct thread_data *td,
+ const char *host, unsigned short port)
+{
+ struct netio_data *nd = td->io_ops->data;
+
+ if (!host) {
+ log_err("fio: connect with no host to connect to.\n");
+ if (td_read(td))
+ log_err("fio: did you forget to set 'listen'?\n");
+
+ td_verror(td, EINVAL, "no hostname= set");
+ return 1;
+ }
nd->addr.sin_family = AF_INET;
nd->addr.sin_port = htons(port);
return 0;
}
-static int fio_netio_setup_listen(struct thread_data *td, short port)
+static int fio_netio_setup_connect_unix(struct thread_data *td,
+ const char *path)
{
struct netio_data *nd = td->io_ops->data;
+ struct sockaddr_un *soun = &nd->addr_un;
+
+ soun->sun_family = AF_UNIX;
+ strcpy(soun->sun_path, path);
+ return 0;
+}
+
+static int fio_netio_setup_connect(struct thread_data *td)
+{
+ struct netio_options *o = td->eo;
+
+ if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+ return fio_netio_setup_connect_inet(td, td->o.filename,o->port);
+ else
+ return fio_netio_setup_connect_unix(td, td->o.filename);
+}
+
+static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
+{
+ struct netio_data *nd = td->io_ops->data;
+ struct sockaddr_un *addr = &nd->addr_un;
+ mode_t mode;
+ int len, fd;
+
+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ log_err("fio: socket: %s\n", strerror(errno));
+ return -1;
+ }
+
+ mode = umask(000);
+
+ memset(addr, 0, sizeof(*addr));
+ addr->sun_family = AF_UNIX;
+ strcpy(addr->sun_path, path);
+ unlink(path);
+
+ len = sizeof(addr->sun_family) + strlen(path) + 1;
+
+ if (bind(fd, (struct sockaddr *) addr, len) < 0) {
+ log_err("fio: bind: %s\n", strerror(errno));
+ close(fd);
+ return -1;
+ }
+
+ umask(mode);
+ nd->listenfd = fd;
+ return 0;
+}
+
+static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
+{
+ struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
int fd, opt, type;
- if (nd->net_protocol == IPPROTO_TCP)
+ if (o->proto == FIO_TYPE_TCP)
type = SOCK_STREAM;
else
type = SOCK_DGRAM;
- fd = socket(AF_INET, type, nd->net_protocol);
+ fd = socket(AF_INET, type, 0);
if (fd < 0) {
td_verror(td, errno, "socket");
return 1;
}
opt = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) &opt, sizeof(opt)) < 0) {
td_verror(td, errno, "setsockopt");
return 1;
}
#ifdef SO_REUSEPORT
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (void *) &opt, sizeof(opt)) < 0) {
td_verror(td, errno, "setsockopt");
return 1;
}
td_verror(td, errno, "bind");
return 1;
}
- if (nd->net_protocol == IPPROTO_TCP && listen(fd, 1) < 0) {
- td_verror(td, errno, "listen");
- return 1;
- }
nd->listenfd = fd;
return 0;
}
-static int fio_netio_init(struct thread_data *td)
+static int fio_netio_setup_listen(struct thread_data *td)
{
struct netio_data *nd = td->io_ops->data;
- unsigned int port;
- char host[64], buf[128];
- char *sep, *portp, *modep;
+ struct netio_options *o = td->eo;
int ret;
- if (td_rw(td)) {
- log_err("fio: network connections must be read OR write\n");
+ if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+ ret = fio_netio_setup_listen_inet(td, o->port);
+ else
+ ret = fio_netio_setup_listen_unix(td, td->o.filename);
+
+ if (ret)
+ return ret;
+ if (o->proto == FIO_TYPE_UDP)
+ return 0;
+
+ if (listen(nd->listenfd, 10) < 0) {
+ td_verror(td, errno, "listen");
+ nd->listenfd = -1;
return 1;
}
+
+ return 0;
+}
+
+static int fio_netio_init(struct thread_data *td)
+{
+ struct netio_options *o = td->eo;
+ int ret;
+
+#ifdef WIN32
+ WSADATA wsd;
+ WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
if (td_random(td)) {
log_err("fio: network IO can't be random\n");
return 1;
}
- strcpy(buf, td->o.filename);
-
- sep = strchr(buf, '/');
- if (!sep)
- goto bad_host;
-
- *sep = '\0';
- sep++;
- strcpy(host, buf);
- if (!strlen(host))
- goto bad_host;
-
- modep = NULL;
- portp = sep;
- sep = strchr(portp, '/');
- if (sep) {
- *sep = '\0';
- modep = sep + 1;
- }
-
- port = strtol(portp, NULL, 10);
- if (!port || port > 65535)
- goto bad_host;
-
- if (modep) {
- if (!strncmp("tcp", modep, strlen(modep)) ||
- !strncmp("TCP", modep, strlen(modep)))
- nd->net_protocol = IPPROTO_TCP;
- else if (!strncmp("udp", modep, strlen(modep)) ||
- !strncmp("UDP", modep, strlen(modep)))
- nd->net_protocol = IPPROTO_UDP;
- else
- goto bad_host;
- } else
- nd->net_protocol = IPPROTO_TCP;
+ if (o->proto == FIO_TYPE_UNIX && o->port) {
+ log_err("fio: network IO port not valid with unix socket\n");
+ return 1;
+ } else if (o->proto != FIO_TYPE_UNIX && !o->port) {
+ log_err("fio: network IO requires port for tcp or udp\n");
+ return 1;
+ }
- if (td_read(td)) {
- nd->send_to_net = 0;
- ret = fio_netio_setup_listen(td, port);
- } else {
- nd->send_to_net = 1;
- ret = fio_netio_setup_connect(td, host, port);
+ if (o->proto != FIO_TYPE_TCP) {
+ if (o->listen) {
+ log_err("fio: listen only valid for TCP proto IO\n");
+ return 1;
+ }
+ if (td_rw(td)) {
+ log_err("fio: datagram network connections must be"
+ " read OR write\n");
+ return 1;
+ }
+ if (o->proto == FIO_TYPE_UNIX && !td->o.filename) {
+ log_err("fio: UNIX sockets need host/filename\n");
+ return 1;
+ }
+ o->listen = td_read(td);
+ }
+
+ if (o->proto != FIO_TYPE_UNIX && o->listen && td->o.filename) {
+ log_err("fio: hostname not valid for inbound network IO\n");
+ return 1;
}
+ if (o->listen)
+ ret = fio_netio_setup_listen(td);
+ else
+ ret = fio_netio_setup_connect(td);
+
return ret;
-bad_host:
- log_err("fio: bad network host/port/protocol: %s\n", td->o.filename);
- return 1;
}
static void fio_netio_cleanup(struct thread_data *td)
{
struct netio_data *nd;
+ if (!td->files_index) {
+ add_file(td, td->o.filename ?: "net");
+ td->o.nr_files = td->o.nr_files ?: 1;
+ }
+
if (!td->io_ops->data) {
nd = malloc(sizeof(*nd));;
return 0;
}
-#ifdef FIO_HAVE_SPLICE
+static void fio_netio_terminate(struct thread_data *td)
+{
+ kill(td->pid, SIGUSR2);
+}
+
+#ifdef CONFIG_LINUX_SPLICE
static int fio_netio_setup_splice(struct thread_data *td)
{
struct netio_data *nd;
}
static struct ioengine_ops ioengine_splice = {
- .name = "netsplice",
- .version = FIO_IOOPS_VERSION,
- .prep = fio_netio_prep,
- .queue = fio_netio_queue,
- .setup = fio_netio_setup_splice,
- .init = fio_netio_init,
- .cleanup = fio_netio_cleanup,
- .open_file = fio_netio_open_file,
- .close_file = generic_close_file,
- .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
- FIO_SIGQUIT | FIO_PIPEIO,
+ .name = "netsplice",
+ .version = FIO_IOOPS_VERSION,
+ .prep = fio_netio_prep,
+ .queue = fio_netio_queue,
+ .setup = fio_netio_setup_splice,
+ .init = fio_netio_init,
+ .cleanup = fio_netio_cleanup,
+ .open_file = fio_netio_open_file,
+ .close_file = fio_netio_close_file,
+ .terminate = fio_netio_terminate,
+ .options = options,
+ .option_struct_size = sizeof(struct netio_options),
+ .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+ FIO_PIPEIO,
};
#endif
static struct ioengine_ops ioengine_rw = {
- .name = "net",
- .version = FIO_IOOPS_VERSION,
- .prep = fio_netio_prep,
- .queue = fio_netio_queue,
- .setup = fio_netio_setup,
- .init = fio_netio_init,
- .cleanup = fio_netio_cleanup,
- .open_file = fio_netio_open_file,
- .close_file = fio_netio_close_file,
- .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
- FIO_SIGQUIT | FIO_PIPEIO,
+ .name = "net",
+ .version = FIO_IOOPS_VERSION,
+ .prep = fio_netio_prep,
+ .queue = fio_netio_queue,
+ .setup = fio_netio_setup,
+ .init = fio_netio_init,
+ .cleanup = fio_netio_cleanup,
+ .open_file = fio_netio_open_file,
+ .close_file = fio_netio_close_file,
+ .terminate = fio_netio_terminate,
+ .options = options,
+ .option_struct_size = sizeof(struct netio_options),
+ .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+ FIO_PIPEIO | FIO_BIT_BASED,
};
+static int str_hostname_cb(void *data, const char *input)
+{
+ struct netio_options *o = data;
+
+ if (o->td->o.filename)
+ free(o->td->o.filename);
+ o->td->o.filename = strdup(input);
+ return 0;
+}
+
static void fio_init fio_netio_register(void)
{
register_ioengine(&ioengine_rw);
-#ifdef FIO_HAVE_SPLICE
+#ifdef CONFIG_LINUX_SPLICE
register_ioengine(&ioengine_splice);
#endif
}
static void fio_exit fio_netio_unregister(void)
{
unregister_ioengine(&ioengine_rw);
-#ifdef FIO_HAVE_SPLICE
+#ifdef CONFIG_LINUX_SPLICE
unregister_ioengine(&ioengine_splice);
#endif
}