Merge branch 'master' into gfio

[fio.git] / time.c

diff --git a/time.c b/time.c
index 643fcea8c04c4f481212443f0fd1e642562ef902..4af84bc7cc5b6a2e1f0be57f284e3e6c3d57f2c8 100644 (file)
--- a/time.c
+++ b/time.c
@@ -48,16 +48,13 @@ unsigned long mtime_since(struct timeval *s, struct timeval *e)
                usec += 1000000;
        }
 
+       if (sec < 0 || (sec == 0 && usec < 0))
+               return 0;
+
        sec *= 1000UL;
        usec /= 1000UL;
        ret = sec + usec;
 
-       /*
-        * time warp bug on some kernels?
-        */
-       if (ret < 0)
-               ret = 0;
-
        return ret;
 }
 
@@ -122,43 +119,6 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
        } while (!td->terminate);
 }
 
-void rate_throttle(struct thread_data *td, unsigned long time_spent,
-                  unsigned int bytes)
-{
-       unsigned long usec_cycle;
-       unsigned int bs;
-
-       if (!td->o.rate && !td->o.rate_iops)
-               return;
-
-       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 -= utime_since_now(&t);
-               }
-       } else {
-               long overtime = time_spent - usec_cycle;
-
-               td->rate_pending_usleep -= overtime;
-       }
-}
-
 unsigned long mtime_since_genesis(void)
 {
        return mtime_since_now(&genesis);
@@ -187,10 +147,12 @@ int ramp_time_over(struct thread_data *td)
        return 0;
 }
 
-static void fio_init time_init(void)
+void fio_time_init(void)
 {
        int i;
 
+       fio_clock_init();
+
        /*
         * Check the granularity of the nanosleep function
         */