flow: quiesce pending IO before sleep

[fio.git] / engines / splice.c

diff --git a/engines/splice.c b/engines/splice.c
index 28e1fb04efa79f6d99a695aff0b1fe8fd1b62379..f35ae17bc574b7af5928e4c73e6e76f8a744b230 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -15,8 +15,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_SPLICE
-
 struct spliceio_data {
        int pipe[2];
        int vmsplice_to_user;
@@ -204,7 +202,7 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;
-       int uninitialized_var(ret);
+       int ret = 0;
 
        fio_ro_check(td, io_u);
 
@@ -223,8 +221,10 @@ static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
                        ret = fio_splice_read_old(td, io_u);
        } else if (io_u->ddir == DDIR_WRITE)
                ret = fio_splice_write(td, io_u);
+       else if (io_u->ddir == DDIR_TRIM)
+               ret = do_io_u_trim(td, io_u);
        else
-               ret = fsync(io_u->file->fd);
+               ret = do_io_u_sync(td, io_u);
 
        if (ret != (int) io_u->xfer_buflen) {
                if (ret >= 0) {
@@ -282,7 +282,7 @@ static int fio_spliceio_init(struct thread_data *td)
         * buffers. Just set ->odirect to force that.
         */
        if (td_read(td))
-               td->o.odirect = 1;
+               td->o.mem_align = 1;
 
        td->io_ops->data = sd;
        return 0;
@@ -297,30 +297,9 @@ static struct ioengine_ops ioengine = {
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
        .get_file_size  = generic_get_file_size,
-       .flags          = FIO_SYNCIO,
-};
-
-#else /* FIO_HAVE_SPLICE */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_spliceio_init(struct thread_data fio_unused *td)
-{
-       fprintf(stderr, "fio: splice not available\n");
-       return 1;
-}
-
-static struct ioengine_ops ioengine = {
-       .name           = "splice",
-       .version        = FIO_IOOPS_VERSION,
-       .init           = fio_spliceio_init,
+       .flags          = FIO_SYNCIO | FIO_PIPEIO,
 };
 
-#endif
-
 static void fio_init fio_spliceio_register(void)
 {
        register_ioengine(&ioengine);