Merge branch 'atomic-writes'

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 86ad74245a5e72a333e3c330c06ecdf42d314c64..c49cd4df0237be5e1c25412d20390a0703eda04b 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -755,7 +755,7 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
         * See if it's time to fsync/fdatasync/sync_file_range first,
         * and if not then move on to check regular I/Os.
         */
-       if (should_fsync(td)) {
+       if (should_fsync(td) && td->last_ddir_issued == DDIR_WRITE) {
                if (td->o.fsync_blocks && td->io_issues[DDIR_WRITE] &&
                    !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks))
                        return DDIR_SYNC;
@@ -815,7 +815,7 @@ static void set_rw_ddir(struct thread_data *td, struct io_u *io_u)
        if (td->o.zone_mode == ZONE_MODE_ZBD)
                ddir = zbd_adjust_ddir(td, io_u, ddir);
 
-       if (td_trimwrite(td)) {
+       if (td_trimwrite(td) && !ddir_sync(ddir)) {
                struct fio_file *f = io_u->file;
                if (f->last_start[DDIR_WRITE] == f->last_start[DDIR_TRIM])
                        ddir = DDIR_TRIM;
@@ -1065,7 +1065,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
                }
        }
 
-       if (td->o.dp_type == FIO_DP_FDP)
+       if (td->o.dp_type != FIO_DP_NONE)
                dp_fill_dspec_data(td, io_u);
 
        if (io_u->offset + io_u->buflen > io_u->file->real_file_size) {
@@ -1757,7 +1757,7 @@ static bool check_get_trim(struct thread_data *td, struct io_u *io_u)
                if (get_next_trim(td, io_u))
                        return true;
        } else if (!(td->io_hist_len % td->o.trim_backlog) &&
-                    td->last_ddir != DDIR_READ) {
+                    td->last_ddir_completed != DDIR_READ) {
                td->trim_batch = td->o.trim_batch;
                if (!td->trim_batch)
                        td->trim_batch = td->o.trim_backlog;
@@ -1779,7 +1779,7 @@ static bool check_get_verify(struct thread_data *td, struct io_u *io_u)
                if (td->verify_batch)
                        get_verify = 1;
                else if (!(td->io_hist_len % td->o.verify_backlog) &&
-                        td->last_ddir != DDIR_READ) {
+                        td->last_ddir_completed != DDIR_READ) {
                        td->verify_batch = td->o.verify_batch;
                        if (!td->verify_batch)
                                td->verify_batch = td->o.verify_backlog;
@@ -1963,7 +1963,7 @@ static void __io_u_log_error(struct thread_data *td, struct io_u *io_u)
        zbd_log_err(td, io_u);
 
        if (td->io_ops->errdetails) {
-               char *err = td->io_ops->errdetails(io_u);
+               char *err = td->io_ops->errdetails(td, io_u);
 
                log_err("fio: %s\n", err);
                free(err);
@@ -2016,8 +2016,7 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,
                unsigned long long tnsec;
 
                tnsec = ntime_since(&io_u->start_time, &icd->time);
-               add_lat_sample(td, idx, tnsec, bytes, io_u->offset,
-                              io_u->ioprio, io_u->clat_prio_index);
+               add_lat_sample(td, idx, tnsec, bytes, io_u);
 
                if (td->flags & TD_F_PROFILE_OPS) {
                        struct prof_io_ops *ops = &td->prof_io_ops;
@@ -2038,8 +2037,7 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,
 
        if (ddir_rw(idx)) {
                if (!td->o.disable_clat) {
-                       add_clat_sample(td, idx, llnsec, bytes, io_u->offset,
-                                       io_u->ioprio, io_u->clat_prio_index);
+                       add_clat_sample(td, idx, llnsec, bytes, io_u);
                        io_u_mark_latency(td, llnsec);
                }
 
@@ -2122,7 +2120,7 @@ static void io_completed(struct thread_data *td, struct io_u **io_u_ptr,
                return;
        }
 
-       td->last_ddir = ddir;
+       td->last_ddir_completed = ddir;
 
        if (!io_u->error && ddir_rw(ddir)) {
                unsigned long long bytes = io_u->xfer_buflen - io_u->resid;
@@ -2301,15 +2299,9 @@ int io_u_queued_complete(struct thread_data *td, int min_evts)
 void io_u_queued(struct thread_data *td, struct io_u *io_u)
 {
        if (!td->o.disable_slat && ramp_time_over(td) && td->o.stats) {
-               unsigned long slat_time;
-
-               slat_time = ntime_since(&io_u->start_time, &io_u->issue_time);
-
                if (td->parent)
                        td = td->parent;
-
-               add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen,
-                               io_u->offset, io_u->ioprio);
+               add_slat_sample(td, io_u);
        }
 }