Merge branch 'ci' of https://github.com/sitsofe/fio

[fio.git] / time.c

diff --git a/time.c b/time.c
index b145e90e2da2fe2c4fa7e44100451f5c9434fabc..edfe779bc2423876e949be48b11fb3ed354af986 100644 (file)
--- a/time.c
+++ b/time.c
@@ -3,15 +3,32 @@
 
 #include "fio.h"
 
-static struct timeval genesis;
+static struct timespec genesis;
 static unsigned long ns_granularity;
 
+void timespec_add_msec(struct timespec *ts, unsigned int msec)
+{
+       unsigned long adj_nsec = 1000000 * msec;
+
+       ts->tv_nsec += adj_nsec;
+       if (adj_nsec >= 1000000000) {
+               unsigned long adj_sec = adj_nsec / 1000000000UL;
+
+               ts->tv_nsec -=  adj_sec * 1000000000UL;
+               ts->tv_sec += adj_sec;
+       }
+       if (ts->tv_nsec >= 1000000000UL){
+               ts->tv_nsec -= 1000000000UL;
+               ts->tv_sec++;
+       }
+}
+
 /*
  * busy looping version for the last few usec
  */
 uint64_t usec_spin(unsigned int usec)
 {
-       struct timeval start;
+       struct timespec start;
        uint64_t t;
 
        fio_gettime(&start, NULL);
@@ -24,7 +41,7 @@ uint64_t usec_spin(unsigned int 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 {
@@ -75,7 +92,7 @@ uint64_t utime_since_genesis(void)
        return utime_since_now(&genesis);
 }
 
-int in_ramp_time(struct thread_data *td)
+bool in_ramp_time(struct thread_data *td)
 {
        return td->o.ramp_time && !td->ramp_time_over;
 }
@@ -92,23 +109,20 @@ static void parent_update_ramp(struct thread_data *td)
        td_set_runstate(parent, TD_RAMP);
 }
 
-int ramp_time_over(struct thread_data *td)
+bool ramp_time_over(struct thread_data *td)
 {
-       struct timeval tv;
-
        if (!td->o.ramp_time || td->ramp_time_over)
-               return 1;
+               return true;
 
-       fio_gettime(&tv, NULL);
-       if (utime_since(&td->epoch, &tv) >= td->o.ramp_time) {
+       if (utime_since_now(&td->epoch) >= td->o.ramp_time) {
                td->ramp_time_over = 1;
                reset_all_stats(td);
                td_set_runstate(td, TD_RAMP);
                parent_update_ramp(td);
-               return 1;
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 void fio_time_init(void)
@@ -121,8 +135,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);
@@ -142,7 +155,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));
 }