#include <arpa/inet.h>
#include <netdb.h>
#include <sys/poll.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include "../fio.h"
static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
{
struct netio_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
return 1;
}
- if (io_u->ddir == DDIR_SYNC)
- return 0;
- if (io_u->offset == f->last_completed_pos)
- return 0;
-
- /*
- * 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, "cannot seek");
- return 1;
+ return 0;
}
+#ifdef FIO_HAVE_SPLICE
static int splice_io_u(int fdin, int fdout, unsigned int len)
{
int bytes = 0;
return ret;
}
+#else
+static int fio_netio_splice_in(struct thread_data *td, struct io_u *io_u)
+{
+ errno = EOPNOTSUPP;
+ return -1;
+}
+
+static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
+{
+ errno = EOPNOTSUPP;
+ return -1;
+}
+#endif
static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
{
/*
* 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)
flags = MSG_MORE;
+#endif
return send(io_u->file->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
}
struct netio_data *nd = td->io_ops->data;
int ret;
+ fio_ro_check(td, io_u);
+
if (io_u->ddir == DDIR_WRITE) {
if (nd->use_splice)
ret = fio_netio_splice_out(td, io_u);
static int fio_netio_init(struct thread_data *td)
{
struct netio_data *nd = td->io_ops->data;
- unsigned short port;
+ unsigned int port;
char host[64], buf[128];
char *sep;
int ret;
strcpy(buf, td->o.filename);
sep = strchr(buf, '/');
- if (!sep) {
- log_err("fio: bad network host/port <<%s>>\n", td->o.filename);
- return 1;
- }
+ if (!sep)
+ goto bad_host;
*sep = '\0';
sep++;
strcpy(host, buf);
- port = atoi(sep);
+ if (!strlen(host))
+ goto bad_host;
+
+ port = strtol(sep, NULL, 10);
+ if (!port || port > 65535)
+ goto bad_host;
if (td_read(td)) {
nd->send_to_net = 0;
}
return ret;
+bad_host:
+ log_err("fio: bad network host/port: %s\n", td->o.filename);
+ return 1;
}
static void fio_netio_cleanup(struct thread_data *td)
close(nd->pipes[1]);
free(nd);
- td->io_ops->data = NULL;
}
}
return 0;
}
+#ifdef FIO_HAVE_SPLICE
static int fio_netio_setup_splice(struct thread_data *td)
{
struct netio_data *nd;
return 1;
}
-static struct ioengine_ops ioengine_rw = {
- .name = "net",
+static struct ioengine_ops ioengine_splice = {
+ .name = "netsplice",
.version = FIO_IOOPS_VERSION,
.prep = fio_netio_prep,
.queue = fio_netio_queue,
- .setup = fio_netio_setup,
+ .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,
+ .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+ FIO_SIGQUIT,
};
+#endif
-static struct ioengine_ops ioengine_splice = {
- .name = "netsplice",
+static struct ioengine_ops ioengine_rw = {
+ .name = "net",
.version = FIO_IOOPS_VERSION,
.prep = fio_netio_prep,
.queue = fio_netio_queue,
- .setup = fio_netio_setup_splice,
+ .setup = fio_netio_setup,
.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,
+ .flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+ FIO_SIGQUIT,
};
static void fio_init fio_netio_register(void)
{
register_ioengine(&ioengine_rw);
+#ifdef FIO_HAVE_SPLICE
register_ioengine(&ioengine_splice);
+#endif
}
static void fio_exit fio_netio_unregister(void)
{
unregister_ioengine(&ioengine_rw);
+#ifdef FIO_HAVE_SPLICE
unregister_ioengine(&ioengine_splice);
+#endif
}