[PATCH] ioengine flags: Replace FIO_NETIO with real flags that map the
[fio.git] / time.c
diff --git a/time.c b/time.c
index 11ee0e07b94a5030cf79817fda5ce8609320bf81..45a415cbb43424bf54266f3913b287e5515efd39 100644 (file)
--- a/time.c
+++ b/time.c
@@ -109,14 +109,22 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 }
 
 void rate_throttle(struct thread_data *td, unsigned long time_spent,
-                  unsigned int bytes, int ddir)
+                  unsigned int bytes)
 {
        unsigned long usec_cycle;
+       unsigned int bs;
 
        if (!td->rate)
                return;
 
-       usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
+       if (td_rw(td))
+               bs = td->rw_min_bs;
+       else if (td_read(td))
+               bs = td->min_bs[DDIR_READ];
+       else
+               bs = td->min_bs[DDIR_WRITE];
+
+       usec_cycle = td->rate_usec_cycle * (bytes / bs);
 
        if (time_spent < usec_cycle) {
                unsigned long s = usec_cycle - time_spent;