Enable preadv2/pwritev2 engines by default on Linux

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 146090e7f168d232fd055bb1a110229e35c0466a..53848843860011441ed60c199e17437199545a6c 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,7 +1903,7 @@ 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) {
@@ -1946,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;
 }