Improve rate limiting

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index e218a30f6f24da6a2cfc6134717c3d04ad6305c1..bac65739a1ad05843561e2f7dfca1e389265b769 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -661,7 +661,8 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
 /*
  * Get next file to service by choosing one at random
  */
-static struct fio_file *get_next_file_rand(struct thread_data *td, enum fio_file_flags goodf,
+static struct fio_file *get_next_file_rand(struct thread_data *td,
+                                          enum fio_file_flags goodf,
                                           enum fio_file_flags badf)
 {
        struct fio_file *f;
@@ -952,21 +953,27 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                td->this_io_bytes[idx] += bytes;
 
                if (ramp_time_over(td)) {
-                       if (!td->o.disable_clat || !td->o.disable_bw ||
-                           __should_check_rate(td, idx))
-                               usec = utime_since(&io_u->issue_time,
+                       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, usec, bytes);
-                               io_u_mark_latency(td, usec);
+                               io_u_mark_latency(td, lusec);
                        }
                        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] - usec;
+                               td->rate_pending_usleep[idx] += (long) td->rate_usec_cycle[idx] - rusec;
                        if (__should_check_rate(td, idx ^ 1))
-                               td->rate_pending_usleep[idx ^ 1] -= usec;
+                               td->rate_pending_usleep[idx ^ 1] -= lusec;
                }
 
                if (td_write(td) && idx == DDIR_WRITE &&
@@ -1085,7 +1092,7 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u)
                unsigned long slat_time;
 
                slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
-               add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
+               add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen);
        }
 }