pre_read fixes

[fio.git] / time.c

diff --git a/time.c b/time.c
index 08ef078277ba125d43d1ce956db2ea92091e0793..643fcea8c04c4f481212443f0fd1e642562ef902 100644 (file)
--- a/time.c
+++ b/time.c
@@ -6,9 +6,10 @@
 static struct timeval genesis;
 static unsigned long ns_granularity;
 
-unsigned long utime_since(struct timeval *s, struct timeval *e)
+unsigned long long utime_since(struct timeval *s, struct timeval *e)
 {
        long sec, usec;
+       unsigned long long ret;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -17,12 +18,18 @@ unsigned long utime_since(struct timeval *s, struct timeval *e)
                usec += 1000000;
        }
 
-       sec *= (double) 1000000;
+       /*
+        * time warp bug on some kernels?
+        */
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
 
-       return sec + usec;
+       ret = sec * 1000000ULL + usec;
+
+       return ret;
 }
 
-unsigned long utime_since_now(struct timeval *s)
+unsigned long long utime_since_now(struct timeval *s)
 {
        struct timeval t;
 
@@ -32,7 +39,7 @@ unsigned long utime_since_now(struct timeval *s)
 
 unsigned long mtime_since(struct timeval *s, struct timeval *e)
 {
-       long sec, usec;
+       long sec, usec, ret;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -41,10 +48,17 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
                usec += 1000000;
        }
 
-       sec *= (double) 1000;
-       usec /= (double) 1000;
+       sec *= 1000UL;
+       usec /= 1000UL;
+       ret = sec + usec;
+
+       /*
+        * time warp bug on some kernels?
+        */
+       if (ret < 0)
+               ret = 0;
 
-       return sec + usec;
+       return ret;
 }
 
 unsigned long mtime_since_now(struct timeval *s)
@@ -64,7 +78,7 @@ unsigned long time_since_now(struct timeval *s)
 /*
  * busy looping version for the last few usec
  */
-void __usec_sleep(unsigned int usec)
+void usec_spin(unsigned int usec)
 {
        struct timeval start;
 
@@ -82,7 +96,7 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
                unsigned long ts = usec;
 
                if (usec < ns_granularity) {
-                       __usec_sleep(usec);
+                       usec_spin(usec);
                        break;
                }
 
@@ -109,22 +123,34 @@ 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)
+       if (!td->o.rate && !td->o.rate_iops)
                return;
 
-       usec_cycle = td->rate_usec_cycle * (bytes / td->min_bs[ddir]);
+       if (td_rw(td))
+               bs = td->o.rw_min_bs;
+       else if (td_read(td))
+               bs = td->o.min_bs[DDIR_READ];
+       else
+               bs = td->o.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 (td->rate_pending_usleep >= 100000) {
+                       struct timeval t;
+
+                       fio_gettime(&t, NULL);
                        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;
@@ -138,12 +164,33 @@ unsigned long mtime_since_genesis(void)
        return mtime_since_now(&genesis);
 }
 
+int in_ramp_time(struct thread_data *td)
+{
+       return td->o.ramp_time && !td->ramp_time_over;
+}
+
+int ramp_time_over(struct thread_data *td)
+{
+       struct timeval tv;
+
+       if (!td->o.ramp_time || td->ramp_time_over)
+               return 1;
+
+       fio_gettime(&tv, NULL);
+       if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
+               td->ramp_time_over = 1;
+               reset_all_stats(td);
+               td_set_runstate(td, TD_RAMP);
+               return 1;
+       }
+
+       return 0;
+}
+
 static void fio_init time_init(void)
 {
        int i;
 
-       fio_gettime(&genesis, NULL);
-
        /*
         * Check the granularity of the nanosleep function
         */
@@ -164,6 +211,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));