Add ->bytes_done[] to struct thread_data

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 16065128c324e76e3cf9326ff1824fec42baad5b..e4fcfd8332570e549da2d0475e63ca8cb4d4df64 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -552,7 +552,7 @@ void io_u_quiesce(struct thread_data *td)
        while (td->io_u_in_flight) {
                int fio_unused ret;
 
-               ret = io_u_queued_complete(td, 1, NULL);
+               ret = io_u_queued_complete(td, 1);
        }
 }
 
@@ -668,7 +668,17 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 
 static void set_rw_ddir(struct thread_data *td, struct io_u *io_u)
 {
-       io_u->ddir = io_u->acct_ddir = get_rw_ddir(td);
+       enum fio_ddir ddir = get_rw_ddir(td);
+
+       if (td_trimwrite(td)) {
+               struct fio_file *f = io_u->file;
+               if (f->last_pos[DDIR_WRITE] == f->last_pos[DDIR_TRIM])
+                       ddir = DDIR_TRIM;
+               else
+                       ddir = DDIR_WRITE;
+       }
+
+       io_u->ddir = io_u->acct_ddir = ddir;
 
        if (io_u->ddir == DDIR_WRITE && (td->io_ops->flags & FIO_BARRIER) &&
            td->o.barrier_blocks &&
@@ -1596,6 +1606,19 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,
 
        if (!gtod_reduce(td))
                add_iops_sample(td, idx, bytes, &icd->time);
+
+       if (td->ts.nr_block_infos && io_u->ddir == DDIR_TRIM) {
+               uint32_t *info = io_u_block_info(td, io_u);
+               if (BLOCK_INFO_STATE(*info) < BLOCK_STATE_TRIM_FAILURE) {
+                       if (io_u->ddir == DDIR_TRIM) {
+                               *info = BLOCK_INFO(BLOCK_STATE_TRIMMED,
+                                               BLOCK_INFO_TRIMS(*info) + 1);
+                       } else if (io_u->ddir == DDIR_WRITE) {
+                               *info = BLOCK_INFO_SET_STATE(BLOCK_STATE_WRITTEN,
+                                                               *info);
+                       }
+               }
+       }
 }
 
 static long long usec_for_io(struct thread_data *td, enum fio_ddir ddir)
@@ -1762,10 +1785,10 @@ static void ios_completed(struct thread_data *td,
 /*
  * Complete a single io_u for the sync engines.
  */
-int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
-                      uint64_t *bytes)
+int io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
 {
        struct io_completion_data icd;
+       int ddir;
 
        init_icd(td, &icd, 1);
        io_completed(td, &io_u, &icd);
@@ -1778,12 +1801,8 @@ int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
                return -1;
        }
 
-       if (bytes) {
-               int ddir;
-
-               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
-                       bytes[ddir] += icd.bytes_done[ddir];
-       }
+       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+               td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return 0;
 }
@@ -1791,12 +1810,11 @@ int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
 /*
  * Called to complete min_events number of io for the async engines.
  */
-int io_u_queued_complete(struct thread_data *td, int min_evts,
-                        uint64_t *bytes)
+int io_u_queued_complete(struct thread_data *td, int min_evts)
 {
        struct io_completion_data icd;
        struct timespec *tvp = NULL;
-       int ret;
+       int ret, ddir;
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
 
        dprint(FD_IO, "io_u_queued_completed: min=%d\n", min_evts);
@@ -1820,12 +1838,8 @@ int io_u_queued_complete(struct thread_data *td, int min_evts,
                return -1;
        }
 
-       if (bytes) {
-               int ddir;
-
-               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
-                       bytes[ddir] += icd.bytes_done[ddir];
-       }
+       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+               td->bytes_done[ddir] += icd.bytes_done[ddir];
 
        return 0;
 }