Update terse output
[fio.git] / time.c
diff --git a/time.c b/time.c
index 08ef078277ba125d43d1ce956db2ea92091e0793..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;
@@ -142,8 +150,6 @@ static void fio_init time_init(void)
 {
        int i;
 
-       fio_gettime(&genesis, NULL);
-
        /*
         * Check the granularity of the nanosleep function
         */
@@ -164,6 +170,11 @@ static void fio_init time_init(void)
        }
 }
 
+void set_genesis_time(void)
+{
+       fio_gettime(&genesis, NULL);
+}
+
 void fill_start_time(struct timeval *t)
 {
        memcpy(t, &genesis, sizeof(genesis));