zbd: Fix zone report handling

[fio.git] / time.c

diff --git a/time.c b/time.c
index ef05094e733915fc1c2c59a0ef8bd17ac8d9613b..1999969955b2828d6a9d38b425147b5ac3b5babf 100644 (file)
--- a/time.c
+++ b/time.c
@@ -3,100 +3,52 @@
 
 #include "fio.h"
 
-static struct timeval genesis;
+static struct timespec genesis;
 static unsigned long ns_granularity;
 
-unsigned long long utime_since(struct timeval *s, struct timeval *e)
+void timespec_add_msec(struct timespec *ts, unsigned int msec)
 {
-       long sec, usec;
-       unsigned long long ret;
-
-       sec = e->tv_sec - s->tv_sec;
-       usec = e->tv_usec - s->tv_usec;
-       if (sec > 0 && usec < 0) {
-               sec--;
-               usec += 1000000;
-       }
-
-       /*
-        * time warp bug on some kernels?
-        */
-       if (sec < 0 || (sec == 0 && usec < 0))
-               return 0;
-
-       ret = sec * 1000000ULL + usec;
-
-       return ret;
-}
-
-unsigned long long utime_since_now(struct timeval *s)
-{
-       struct timeval t;
+       uint64_t adj_nsec = 1000000ULL * msec;
 
-       fio_gettime(&t, NULL);
-       return utime_since(s, &t);
-}
-
-unsigned long mtime_since(struct timeval *s, struct timeval *e)
-{
-       long sec, usec, ret;
+       ts->tv_nsec += adj_nsec;
+       if (adj_nsec >= 1000000000) {
+               uint64_t adj_sec = adj_nsec / 1000000000;
 
-       sec = e->tv_sec - s->tv_sec;
-       usec = e->tv_usec - s->tv_usec;
-       if (sec > 0 && usec < 0) {
-               sec--;
-               usec += 1000000;
+               ts->tv_nsec -= adj_sec * 1000000000;
+               ts->tv_sec += adj_sec;
+       }
+       if (ts->tv_nsec >= 1000000000){
+               ts->tv_nsec -= 1000000000;
+               ts->tv_sec++;
        }
-
-       sec *= 1000UL;
-       usec /= 1000UL;
-       ret = sec + usec;
-
-       /*
-        * time warp bug on some kernels?
-        */
-       if (ret < 0)
-               ret = 0;
-
-       return ret;
-}
-
-unsigned long mtime_since_now(struct timeval *s)
-{
-       struct timeval t;
-       void *p = __builtin_return_address(0);
-
-       fio_gettime(&t, p);
-       return mtime_since(s, &t);
-}
-
-unsigned long time_since_now(struct timeval *s)
-{
-       return mtime_since_now(s) / 1000;
 }
 
 /*
  * busy looping version for the last few usec
  */
-void usec_spin(unsigned int usec)
+uint64_t usec_spin(unsigned int usec)
 {
-       struct timeval start;
+       struct timespec start;
+       uint64_t t;
 
        fio_gettime(&start, NULL);
-       while (utime_since_now(&start) < usec)
+       while ((t = utime_since_now(&start)) < usec)
                nop;
+
+       return t;
 }
 
-void usec_sleep(struct thread_data *td, unsigned long usec)
+uint64_t usec_sleep(struct thread_data *td, unsigned long usec)
 {
        struct timespec req;
-       struct timeval tv;
+       struct timespec tv;
+       uint64_t t = 0;
 
        do {
                unsigned long ts = usec;
 
                if (usec < ns_granularity) {
-                       usec_spin(usec);
+                       t += usec_spin(usec);
                        break;
                }
 
@@ -115,39 +67,72 @@ void usec_sleep(struct thread_data *td, unsigned long usec)
                        break;
 
                ts = utime_since_now(&tv);
+               t += ts;
                if (ts >= usec)
                        break;
 
                usec -= ts;
        } while (!td->terminate);
+
+       return t;
 }
 
-unsigned long mtime_since_genesis(void)
+uint64_t time_since_genesis(void)
+{
+       return time_since_now(&genesis);
+}
+
+uint64_t mtime_since_genesis(void)
 {
        return mtime_since_now(&genesis);
 }
 
-int in_ramp_time(struct thread_data *td)
+uint64_t utime_since_genesis(void)
+{
+       return utime_since_now(&genesis);
+}
+
+bool in_ramp_time(struct thread_data *td)
 {
        return td->o.ramp_time && !td->ramp_time_over;
 }
 
-int ramp_time_over(struct thread_data *td)
+static bool parent_update_ramp(struct thread_data *td)
 {
-       struct timeval tv;
+       struct thread_data *parent = td->parent;
+
+       if (!parent || parent->ramp_time_over)
+               return false;
 
+       reset_all_stats(parent);
+       parent->ramp_time_over = true;
+       td_set_runstate(parent, TD_RAMP);
+       return true;
+}
+
+bool ramp_time_over(struct thread_data *td)
+{
        if (!td->o.ramp_time || td->ramp_time_over)
-               return 1;
+               return true;
 
-       fio_gettime(&tv, NULL);
-       if (mtime_since(&td->epoch, &tv) >= td->o.ramp_time * 1000) {
-               td->ramp_time_over = 1;
+       if (utime_since_now(&td->epoch) >= td->o.ramp_time) {
+               td->ramp_time_over = true;
                reset_all_stats(td);
+               reset_io_stats(td);
                td_set_runstate(td, TD_RAMP);
-               return 1;
+
+               /*
+                * If we have a parent, the parent isn't doing IO. Hence
+                * the parent never enters do_io(), which will switch us
+                * from RAMP -> RUNNING. Do this manually here.
+                */
+               if (parent_update_ramp(td))
+                       td_set_runstate(td, TD_RUNNING);
+
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 void fio_time_init(void)
@@ -160,8 +145,7 @@ void fio_time_init(void)
         * Check the granularity of the nanosleep function
         */
        for (i = 0; i < 10; i++) {
-               struct timeval tv;
-               struct timespec ts;
+               struct timespec tv, ts;
                unsigned long elapsed;
 
                fio_gettime(&tv, NULL);
@@ -181,7 +165,18 @@ void set_genesis_time(void)
        fio_gettime(&genesis, NULL);
 }
 
-void fill_start_time(struct timeval *t)
+void set_epoch_time(struct thread_data *td, int log_unix_epoch)
+{
+       fio_gettime(&td->epoch, NULL);
+       if (log_unix_epoch) {
+               struct timeval tv;
+               gettimeofday(&tv, NULL);
+               td->unix_epoch = (unsigned long long)(tv.tv_sec) * 1000 +
+                                (unsigned long long)(tv.tv_usec) / 1000;
+       }
+}
+
+void fill_start_time(struct timespec *t)
 {
        memcpy(t, &genesis, sizeof(genesis));
 }