The following changes since commit 3fb82dc48826dd7c23a435eea0618eca9955bf57:
Fio 2.1 (2013-05-15 08:42:26 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (3):
sync engine: add support for pwritev/preadv
Document pvsync engine
sync engine: guard pvsync engine register/unregister
HOWTO | 2 ++
configure | 20 ++++++++++++++++++++
engines/sync.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
fio.1 | 3 +++
options.c | 5 +++++
5 files changed, 77 insertions(+), 0 deletions(-)
---
Diff of recent changes:
diff --git a/HOWTO b/HOWTO
index b1dcd29..9b2edb3 100644
--- a/HOWTO
+++ b/HOWTO
@@ -568,6 +568,8 @@ ioengine=str Defines how the job issues io to the file. The following
vsync Basic readv(2) or writev(2) IO.
+ psyncv Basic preadv(2) or pwritev(2) IO.
+
libaio Linux native asynchronous io. Note that Linux
may only support queued behaviour with
non-buffered IO (set direct=1 or buffered=0).
diff --git a/configure b/configure
index 5939bed..95765cc 100755
--- a/configure
+++ b/configure
@@ -1066,6 +1066,23 @@ if compile_prog "" "" "RLIMIT_MEMLOCK"; then
fi
echo "RLIMIT_MEMLOCK $rlimit_memlock"
+##########################################
+# Check whether we have pwritev/preadv
+pwritev="no"
+cat > $TMPC << EOF
+#include <stdio.h>
+#include <sys/uio.h>
+int main(int argc, char **argv)
+{
+ return pwritev(0, NULL, 1, 0) + preadv(0, NULL, 1, 0);
+}
+EOF
+if compile_prog "" "" "pwritev"; then
+ pwritev="yes"
+fi
+echo "pwritev/preadv $pwritev"
+
+
#############################################################################
if test "$wordsize" = "64" ; then
@@ -1181,6 +1198,9 @@ fi
if test "$rlimit_memlock" = "yes" ; then
output_sym "CONFIG_RLIMIT_MEMLOCK"
fi
+if test "$pwritev" = "yes" ; then
+ output_sym "CONFIG_PWRITEV"
+fi
echo "LIBS+=$LIBS" >> $config_host_mak
echo "CFLAGS+=$CFLAGS" >> $config_host_mak
diff --git a/engines/sync.c b/engines/sync.c
index 8779628..1329946 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -69,6 +69,33 @@ static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)
return FIO_Q_COMPLETED;
}
+#ifdef CONFIG_PWRITEV
+static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
+{
+ struct syncio_data *sd = td->io_ops->data;
+ struct iovec *iov = &sd->iovecs[0];
+ struct fio_file *f = io_u->file;
+ int ret;
+
+ fio_ro_check(td, io_u);
+
+ iov->iov_base = io_u->xfer_buf;
+ iov->iov_len = io_u->xfer_buflen;
+
+ if (io_u->ddir == DDIR_READ)
+ ret = preadv(f->fd, iov, 1, io_u->offset);
+ else if (io_u->ddir == DDIR_WRITE)
+ ret = pwritev(f->fd, iov, 1, io_u->offset);
+ else if (io_u->ddir == DDIR_TRIM) {
+ do_io_u_trim(td, io_u);
+ return FIO_Q_COMPLETED;
+ } else
+ ret = do_io_u_sync(td, io_u);
+
+ return fio_io_end(td, io_u, ret);
+}
+#endif
+
static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f = io_u->file;
@@ -329,11 +356,28 @@ static struct ioengine_ops ioengine_vrw = {
.flags = FIO_SYNCIO,
};
+#ifdef CONFIG_PWRITEV
+static struct ioengine_ops ioengine_pvrw = {
+ .name = "pvsync",
+ .version = FIO_IOOPS_VERSION,
+ .init = fio_vsyncio_init,
+ .cleanup = fio_vsyncio_cleanup,
+ .queue = fio_pvsyncio_queue,
+ .open_file = generic_open_file,
+ .close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
+ .flags = FIO_SYNCIO,
+};
+#endif
+
static void fio_init fio_syncio_register(void)
{
register_ioengine(&ioengine_rw);
register_ioengine(&ioengine_prw);
register_ioengine(&ioengine_vrw);
+#ifdef CONFIG_PWRITEV
+ register_ioengine(&ioengine_pvrw);
+#endif
}
static void fio_exit fio_syncio_unregister(void)
@@ -341,4 +385,7 @@ static void fio_exit fio_syncio_unregister(void)
unregister_ioengine(&ioengine_rw);
unregister_ioengine(&ioengine_prw);
unregister_ioengine(&ioengine_vrw);
+#ifdef CONFIG_PWRITEV
+ unregister_ioengine(&ioengine_pvrw);
+#endif
}
diff --git a/fio.1 b/fio.1
index 5082bf8..f54ea34 100644
--- a/fio.1
+++ b/fio.1
@@ -448,6 +448,9 @@ Basic \fIpread\fR\|(2) or \fIpwrite\fR\|(2) I/O.
Basic \fIreadv\fR\|(2) or \fIwritev\fR\|(2) I/O. Will emulate queuing by
coalescing adjacents IOs into a single submission.
.TP
+.B pvsync
+Basic \fIpreadv\fR\|(2) or \fIpwritev\fR\|(2) I/O.
+.TP
.B libaio
Linux native asynchronous I/O. This ioengine defines engine specific options.
.TP
diff --git a/options.c b/options.c
index 7a4e7b5..e9df6a8 100644
--- a/options.c
+++ b/options.c
@@ -1302,6 +1302,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
{ .ival = "vsync",
.help = "Use readv/writev",
},
+#ifdef CONFIG_PWRITEV
+ { .ival = "pvsync",
+ .help = "Use preadv/pwritev",
+ },
+#endif
#ifdef CONFIG_LIBAIO
{ .ival = "libaio",
.help = "Linux native asynchronous IO",
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
