X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=time.c;h=45a415cbb43424bf54266f3913b287e5515efd39;hp=11ee0e07b94a5030cf79817fda5ce8609320bf81;hb=b58cf3dc6945d661bd5c40c0856a99e0f9c8a9e6;hpb=a2f77c9f5f01186882762264100b6d30ee77a55d diff --git a/time.c b/time.c index 11ee0e07..45a415cb 100644 --- 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;