Assign io_u->error directly in do_io_u_sync()

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 4be958da9641df0328b499713fd7d89a53d0fd06..a4bf0c08581861076ccd31a8f720dcd861fbfe01 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -187,7 +187,7 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
  * until we find a free one. For sequential io, just return the end of
  * the last io issued.
  */
-static int get_next_offset(struct thread_data *td, struct io_u *io_u)
+static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        unsigned long long b;
@@ -231,7 +231,17 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
+static int get_next_offset(struct thread_data *td, struct io_u *io_u)
+{
+       struct prof_io_ops *ops = &td->prof_io_ops;
+
+       if (ops->fill_io_u_off)
+               return ops->fill_io_u_off(td, io_u);
+
+       return __get_next_offset(td, io_u);
+}
+
+static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
        const int ddir = io_u->ddir;
        unsigned int uninitialized_var(buflen);
@@ -276,6 +286,16 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
        return buflen;
 }
 
+static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
+{
+       struct prof_io_ops *ops = &td->prof_io_ops;
+
+       if (ops->fill_io_u_size)
+               return ops->fill_io_u_size(td, io_u);
+
+       return __get_next_buflen(td, io_u);
+}
+
 static void set_rwmix_bytes(struct thread_data *td)
 {
        unsigned int diff;
@@ -374,6 +394,14 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
             td->io_issues[DDIR_WRITE] && should_fsync(td))
                return DDIR_DATASYNC;
 
+       /*
+        * see if it's time to sync_file_range
+        */
+       if (td->sync_file_range_nr &&
+          !(td->io_issues[DDIR_WRITE] % td->sync_file_range_nr) &&
+            td->io_issues[DDIR_WRITE] && should_fsync(td))
+               return DDIR_SYNC_FILE_RANGE;
+
        if (td_rw(td)) {
                /*
                 * Check if it's time to seed a new data direction.
@@ -769,7 +797,7 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
        return f;
 }
 
-static struct fio_file *get_next_file(struct thread_data *td)
+static struct fio_file *__get_next_file(struct thread_data *td)
 {
        struct fio_file *f;
 
@@ -804,6 +832,16 @@ out:
        return f;
 }
 
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+       struct prof_io_ops *ops = &td->prof_io_ops;
+
+       if (ops->get_next_file)
+               return ops->get_next_file(td);
+
+       return __get_next_file(td);
+}
+
 static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f;
@@ -966,6 +1004,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
         * initialized, silence that warning.
         */
        unsigned long uninitialized_var(usec);
+       struct fio_file *f;
 
        dprint_io_u(io_u, "io complete");
 
@@ -976,6 +1015,11 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
        if (ddir_sync(io_u->ddir)) {
                td->last_was_sync = 1;
+               f = io_u->file;
+               if (f) {
+                       f->first_write = -1ULL;
+                       f->last_write = -1ULL;
+               }
                return;
        }
 
@@ -984,23 +1028,31 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
        if (!io_u->error) {
                unsigned int bytes = io_u->buflen - io_u->resid;
                const enum fio_ddir idx = io_u->ddir;
+               const enum fio_ddir odx = io_u->ddir ^ 1;
                int ret;
 
                td->io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
                td->this_io_bytes[idx] += bytes;
 
+               if (idx == DDIR_WRITE) {
+                       f = io_u->file;
+                       if (f) {
+                               if (f->first_write == -1ULL ||
+                                   io_u->offset < f->first_write)
+                                       f->first_write = io_u->offset;
+                               if (f->last_write == -1ULL ||
+                                   ((io_u->offset + bytes) > f->last_write))
+                                       f->last_write = io_u->offset + bytes;
+                       }
+               }
+
                if (ramp_time_over(td)) {
                        unsigned long uninitialized_var(lusec);
-                       unsigned long uninitialized_var(rusec);
 
                        if (!td->o.disable_clat || !td->o.disable_bw)
                                lusec = utime_since(&io_u->issue_time,
                                                        &icd->time);
-                       if (__should_check_rate(td, idx) ||
-                           __should_check_rate(td, idx ^ 1))
-                               rusec = utime_since(&io_u->start_time,
-                                                       &icd->time);
 
                        if (!td->o.disable_clat) {
                                add_clat_sample(td, idx, lusec, bytes);
@@ -1009,11 +1061,16 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                        if (!td->o.disable_bw)
                                add_bw_sample(td, idx, bytes, &icd->time);
                        if (__should_check_rate(td, idx)) {
-                               td->rate_pending_usleep[idx] +=
-                                       (long) td->rate_usec_cycle[idx] - rusec;
+                               td->rate_pending_usleep[idx] =
+                                       ((td->this_io_bytes[idx] *
+                                         td->rate_nsec_cycle[idx]) / 1000 -
+                                        utime_since_now(&td->start));
                        }
                        if (__should_check_rate(td, idx ^ 1))
-                               td->rate_pending_usleep[idx ^ 1] -= rusec;
+                               td->rate_pending_usleep[odx] =
+                                       ((td->this_io_bytes[odx] *
+                                         td->rate_nsec_cycle[odx]) / 1000 -
+                                        utime_since_now(&td->start));
                }
 
                if (td_write(td) && idx == DDIR_WRITE &&