Make lib/pattern.c a stand-alone library

[fio.git] / time.c

diff --git a/time.c b/time.c
index 0e64af55ff96b0a9179367f60ca8f3a7ae90f798..279ee48492302ebd5a1080e5422cc48ecd6b7a59 100644 (file)
--- a/time.c
+++ b/time.c
@@ -8,8 +8,16 @@ static unsigned long ns_granularity;
 
 void timeval_add_msec(struct timeval *tv, unsigned int msec)
 {
-       tv->tv_usec += 1000 * msec;
-       if (tv->tv_usec >= 1000000) {
+       unsigned long adj_usec = 1000 * msec;
+
+       tv->tv_usec += adj_usec;
+       if (adj_usec >= 1000000) {
+               unsigned long adj_sec = adj_usec / 1000000;
+
+               tv->tv_usec -=  adj_sec * 1000000;
+               tv->tv_sec += adj_sec;
+       }
+       if (tv->tv_usec >= 1000000){
                tv->tv_usec -= 1000000;
                tv->tv_sec++;
        }
@@ -84,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;
 }
@@ -101,12 +109,12 @@ 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) {
@@ -114,10 +122,10 @@ int ramp_time_over(struct thread_data *td)
                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)
@@ -151,6 +159,17 @@ void set_genesis_time(void)
        fio_gettime(&genesis, NULL);
 }
 
+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 timeval *t)
 {
        memcpy(t, &genesis, sizeof(genesis));