Fix parse strlen() bug

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 4be958da9641df0328b499713fd7d89a53d0fd06..278d47a4d88baaf30e8a4c0bfeaff9a8e128dd87 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,15 @@ 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)
+{
+       if (td->fill_io_u_off)
+               return td->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 +284,14 @@ 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)
+{
+       if (td->fill_io_u_size)
+               return td->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;
@@ -984,6 +1000,7 @@ 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]++;
@@ -992,15 +1009,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
                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 +1021,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 &&