stat: fix reversed check for ramp time

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index f55cb2f5cc8dfdd4fcc3087d6435134e7405c07b..a8ccd9ab2133bc0a67f1a38de6157f8513f384f2 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1636,16 +1636,21 @@ void __show_run_stats(void)
        if (output_format & FIO_OUTPUT_JSON) {
                struct thread_data *global;
                char time_buf[32];
-               time_t time_p;
+               struct timeval now;
+               unsigned long long ms_since_epoch;
 
-               time(&time_p);
-               os_ctime_r((const time_t *) &time_p, time_buf,
+               gettimeofday(&now, NULL);
+               ms_since_epoch = (unsigned long long)(now.tv_sec) * 1000 +
+                                (unsigned long long)(now.tv_usec) / 1000;
+
+               os_ctime_r((const time_t *) &now.tv_sec, time_buf,
                                sizeof(time_buf));
                time_buf[strlen(time_buf) - 1] = '\0';
 
                root = json_create_object();
                json_object_add_value_string(root, "fio version", fio_version_string);
-               json_object_add_value_int(root, "timestamp", time_p);
+               json_object_add_value_int(root, "timestamp", now.tv_sec);
+               json_object_add_value_int(root, "timestamp_ms", ms_since_epoch);
                json_object_add_value_string(root, "time", time_buf);
                global = get_global_options();
                json_add_job_opts(root, "global options", &global->opt_list, false);
@@ -1898,9 +1903,15 @@ static struct io_logs *regrow_log(struct io_log *iolog)
        int i;
 
        if (!iolog || iolog->disabled)
-               return NULL;
+               goto disable;
 
        cur_log = iolog_cur_log(iolog);
+       if (!cur_log) {
+               cur_log = get_new_log(iolog);
+               if (!cur_log)
+                       return NULL;
+       }
+
        if (cur_log->nr_samples < cur_log->max_samples)
                return cur_log;
 
@@ -1940,21 +1951,19 @@ static struct io_logs *regrow_log(struct io_log *iolog)
 
        iolog->pending->nr_samples = 0;
        return cur_log;
+disable:
+       if (iolog)
+               iolog->disabled = true;
+       return NULL;
 }
 
 void regrow_logs(struct thread_data *td)
 {
-       if (!regrow_log(td->slat_log))
-               td->slat_log->disabled = true;
-       if (!regrow_log(td->clat_log))
-               td->clat_log->disabled = true;
-       if (!regrow_log(td->lat_log))
-               td->lat_log->disabled = true;
-       if (!regrow_log(td->bw_log))
-               td->bw_log->disabled = true;
-       if (!regrow_log(td->iops_log))
-               td->iops_log->disabled = true;
-
+       regrow_log(td->slat_log);
+       regrow_log(td->clat_log);
+       regrow_log(td->lat_log);
+       regrow_log(td->bw_log);
+       regrow_log(td->iops_log);
        td->flags &= ~TD_F_REGROW_LOGS;
 }
 
@@ -2251,9 +2260,6 @@ static int add_bw_samples(struct thread_data *td, struct timeval *t)
        unsigned long spent, rate;
        enum fio_ddir ddir;
 
-       if (per_unit_log(td->bw_log))
-               return 0;
-
        spent = mtime_since(&td->bw_sample_time, t);
        if (spent < td->o.bw_avg_time &&
            td->o.bw_avg_time - spent >= 10)
@@ -2322,9 +2328,6 @@ static int add_iops_samples(struct thread_data *td, struct timeval *t)
        unsigned long spent, iops;
        enum fio_ddir ddir;
 
-       if (per_unit_log(td->iops_log))
-               return 0;
-
        spent = mtime_since(&td->iops_sample_time, t);
        if (spent < td->o.iops_avg_time &&
            td->o.iops_avg_time - spent >= 10)
@@ -2384,7 +2387,7 @@ int calc_log_samples(void)
        fio_gettime(&now, NULL);
 
        for_each_td(td, i) {
-               if (!ramp_time_over(td) ||
+               if (in_ramp_time(td) ||
                    !(td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING)) {
                        next = min(td->o.iops_avg_time, td->o.bw_avg_time);
                        continue;