Move setup_rate() out of log.c

[fio.git] / time.c

diff --git a/time.c b/time.c
index 11ee0e07b94a5030cf79817fda5ce8609320bf81..80f8ca499f159f9e9473219c74480b89e6394652 100644 (file)
--- a/time.c
+++ b/time.c
@@ -109,22 +109,34 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
 }
 
 void rate_throttle(struct thread_data *td, unsigned long time_spent,
 }
 
 void rate_throttle(struct thread_data *td, unsigned long time_spent,

-                  unsigned int bytes, int ddir)
+                  unsigned int bytes)

 {
        unsigned long usec_cycle;
 {
        unsigned long usec_cycle;

+       unsigned int bs;

 
 

-       if (!td->rate)
+       if (!td->rate && !td->rate_iops)

                return;
 
                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;
 
                td->rate_pending_usleep += s;
 
        if (time_spent < usec_cycle) {
                unsigned long s = usec_cycle - time_spent;
 
                td->rate_pending_usleep += s;

+

                if (td->rate_pending_usleep >= 100000) {
                if (td->rate_pending_usleep >= 100000) {

+                       struct timeval t;
+
+                       fio_gettime(&t, NULL);

                        usec_sleep(td, td->rate_pending_usleep);
                        usec_sleep(td, td->rate_pending_usleep);

-                       td->rate_pending_usleep = 0;
+                       td->rate_pending_usleep -= utime_since_now(&t);

                }
        } else {
                long overtime = time_spent - usec_cycle;
                }
        } else {
                long overtime = time_spent - usec_cycle;