Merge branch 'proc_group' of https://github.com/sitsofe/fio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index cec0c760f4a4a2c8c5cc089b8abc6d843dc492ea..a8ec79de473bf235424e9fac80996c112a744364 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -9,7 +9,6 @@
  * generic io engine that could be used for other projects.
  *
  */
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -224,7 +223,8 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
        if (td->io_ops->prep) {
                int ret = td->io_ops->prep(td, io_u);
 
-               dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
+               dprint(FD_IO, "prep: io_u %p: ret=%d\n", io_u, ret);
+
                if (ret)
                        unlock_file(td, io_u->file);
                return ret;
@@ -356,7 +356,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        }
 
        if (ret == FIO_Q_COMPLETED) {
-               if (ddir_rw(io_u->ddir)) {
+               if (ddir_rw(io_u->ddir) || ddir_sync(io_u->ddir)) {
                        io_u_mark_depth(td, 1);
                        td->ts.total_io_u[io_u->ddir]++;
                }
@@ -365,7 +365,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
                td->io_u_queued++;
 
-               if (ddir_rw(io_u->ddir))
+               if (ddir_rw(io_u->ddir) || ddir_sync(io_u->ddir))
                        td->ts.total_io_u[io_u->ddir]++;
 
                if (td->io_u_queued >= td->o.iodepth_batch) {
@@ -497,8 +497,8 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                }
 
                if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
-                       td_verror(td, errno, "fadvise");
-                       goto err;
+                       if (!fio_did_warn(FIO_WARN_FADVISE))
+                               log_err("fio: fadvise hint failed\n");
                }
        }
 #ifdef FIO_HAVE_WRITE_HINT