Track last file offset

[fio.git] / engines / sync.c

diff --git a/engines/sync.c b/engines/sync.c
index 46cb864d770b7819015f354c325c8410fbb878b5..12b85f6a65917c8e2fc197bd35c844bd61684b28 100644 (file)
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/uio.h>
 #include <errno.h>
 #include <assert.h>
 
@@ -17,6 +18,7 @@ struct syncio_data {
        struct iovec *iovecs;
        struct io_u **io_us;
        unsigned int queued;
+       unsigned int events;
        unsigned long queued_bytes;
 
        unsigned long long last_offset;
@@ -28,7 +30,10 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
 
-       if (io_u->ddir == DDIR_SYNC)
+       if (ddir_sync(io_u->ddir))
+               return 0;
+
+       if (f->file_pos != -1ULL && f->file_pos == io_u->offset)
                return 0;
 
        if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
@@ -41,6 +46,9 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 
 static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)
 {
+       if (io_u->file && ret >= 0)
+               io_u->file->file_pos = io_u->offset + ret;
+
        if (ret != (int) io_u->xfer_buflen) {
                if (ret >= 0) {
                        io_u->resid = io_u->xfer_buflen - ret;
@@ -98,8 +106,8 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min,
        int ret;
 
        if (min) {
-               ret = sd->queued;
-               sd->queued = 0;
+               ret = sd->events;
+               sd->events = 0;
        } else
                ret = 0;
 
@@ -118,7 +126,7 @@ static int fio_vsyncio_append(struct thread_data *td, struct io_u *io_u)
 {
        struct syncio_data *sd = td->io_ops->data;
 
-       if (io_u->ddir == DDIR_SYNC)
+       if (ddir_sync(io_u->ddir))
                return 0;
 
        if (io_u->offset == sd->last_offset && io_u->file == sd->last_file &&
@@ -159,8 +167,18 @@ static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u)
                        int ret = fsync(io_u->file->fd);
 
                        return fio_io_end(td, io_u, ret);
+               } else if (io_u->ddir == DDIR_DATASYNC) {
+                       int ret;
+#ifdef FIO_HAVE_FDATASYNC
+                       ret = fdatasync(io_u->file->fd);
+#else
+                       ret = io_u->xfer_buflen;
+                       io_u->error = EINVAL;
+#endif
+                       return fio_io_end(td, io_u, ret);
+                       
                }
-
+       
                sd->queued = 0;
                sd->queued_bytes = 0;
                fio_vsyncio_set_iov(sd, io_u, 0);
@@ -230,6 +248,7 @@ static int fio_vsyncio_commit(struct thread_data *td)
        if (!sd->queued)
                return 0;
 
+       io_u_mark_submit(td, sd->queued);
        f = sd->last_file;
 
        if (lseek(f->fd, sd->io_us[0]->offset, SEEK_SET) == -1) {
@@ -245,6 +264,8 @@ static int fio_vsyncio_commit(struct thread_data *td)
                ret = writev(f->fd, sd->iovecs, sd->queued);
 
        dprint(FD_IO, "vsyncio_commit: %d\n", (int) ret);
+       sd->events = sd->queued;
+       sd->queued = 0;
        return fio_vsyncio_end(td, ret);
 }
 
@@ -269,7 +290,6 @@ static void fio_vsyncio_cleanup(struct thread_data *td)
        free(sd->iovecs);
        free(sd->io_us);
        free(sd);
-       td->io_ops->data = NULL;
 }
 
 static struct ioengine_ops ioengine_rw = {
@@ -279,6 +299,7 @@ static struct ioengine_ops ioengine_rw = {
        .queue          = fio_syncio_queue,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
+       .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO,
 };
 
@@ -288,6 +309,7 @@ static struct ioengine_ops ioengine_prw = {
        .queue          = fio_psyncio_queue,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
+       .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO,
 };
 
@@ -302,6 +324,7 @@ static struct ioengine_ops ioengine_vrw = {
        .getevents      = fio_vsyncio_getevents,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
+       .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO,
 };