t/axmap: add pre/post bit set checks

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 39fe10fcc40c04727984bbaad73cdc69042aed38..a724fe63936bc64caa0719871c9ff90cfb522c49 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -94,7 +94,7 @@ static void check_str_update(struct thread_data *td)
 /*
  * Convert seconds to a printable string.
  */
-static void eta_to_str(char *str, unsigned long eta_sec)
+void eta_to_str(char *str, unsigned long eta_sec)
 {
        unsigned int d, h, m, s;
        int disp_hour = 0;
@@ -139,6 +139,15 @@ static int thread_eta(struct thread_data *td)
                bytes_total = td->fill_device_size;
        }
 
+       if (td->o.zone_size && td->o.zone_skip && bytes_total) {
+               unsigned int nr_zones;
+               uint64_t zone_bytes;
+
+               zone_bytes = bytes_total + td->o.zone_size + td->o.zone_skip;
+               nr_zones = (zone_bytes - 1) / (td->o.zone_size + td->o.zone_skip);
+               bytes_total -= nr_zones * td->o.zone_skip;
+       }
+
        /*
         * if writing and verifying afterwards, bytes_total will be twice the
         * size. In a mixed workload, verify phase will be the size of the
@@ -156,9 +165,6 @@ static int thread_eta(struct thread_data *td)
                        bytes_total <<= 1;
        }
 
-       if (td->o.zone_size && td->o.zone_skip)
-               bytes_total /= (td->o.zone_skip / td->o.zone_size);
-
        if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
                double perc, perc_t;
 
@@ -285,7 +291,8 @@ int calc_thread_status(struct jobs_eta *je, int force)
        static struct timeval rate_prev_time, disp_prev_time;
 
        if (!force) {
-               if (output_format != FIO_OUTPUT_NORMAL)
+               if (output_format != FIO_OUTPUT_NORMAL &&
+                   f_out == stdout)
                        return 0;
                if (temp_stall_ts || eta_print == FIO_ETA_NEVER)
                        return 0;
@@ -319,22 +326,22 @@ int calc_thread_status(struct jobs_eta *je, int force)
                    || td->runstate == TD_PRE_READING) {
                        je->nr_running++;
                        if (td_read(td)) {
-                               je->t_rate += td->o.rate[DDIR_READ];
-                               je->t_iops += td->o.rate_iops[DDIR_READ];
-                               je->m_rate += td->o.ratemin[DDIR_READ];
-                               je->m_iops += td->o.rate_iops_min[DDIR_READ];
+                               je->t_rate[0] += td->o.rate[DDIR_READ];
+                               je->t_iops[0] += td->o.rate_iops[DDIR_READ];
+                               je->m_rate[0] += td->o.ratemin[DDIR_READ];
+                               je->m_iops[0] += td->o.rate_iops_min[DDIR_READ];
                        }
                        if (td_write(td)) {
-                               je->t_rate += td->o.rate[DDIR_WRITE];
-                               je->t_iops += td->o.rate_iops[DDIR_WRITE];
-                               je->m_rate += td->o.ratemin[DDIR_WRITE];
-                               je->m_iops += td->o.rate_iops_min[DDIR_WRITE];
+                               je->t_rate[1] += td->o.rate[DDIR_WRITE];
+                               je->t_iops[1] += td->o.rate_iops[DDIR_WRITE];
+                               je->m_rate[1] += td->o.ratemin[DDIR_WRITE];
+                               je->m_iops[1] += td->o.rate_iops_min[DDIR_WRITE];
                        }
                        if (td_trim(td)) {
-                               je->t_rate += td->o.rate[DDIR_TRIM];
-                               je->t_iops += td->o.rate_iops[DDIR_TRIM];
-                               je->m_rate += td->o.ratemin[DDIR_TRIM];
-                               je->m_iops += td->o.rate_iops_min[DDIR_TRIM];
+                               je->t_rate[2] += td->o.rate[DDIR_TRIM];
+                               je->t_iops[2] += td->o.rate_iops[DDIR_TRIM];
+                               je->m_rate[2] += td->o.ratemin[DDIR_TRIM];
+                               je->m_iops[2] += td->o.rate_iops_min[DDIR_TRIM];
                        }
 
                        je->files_open += td->nr_open_files;
@@ -433,16 +440,19 @@ void display_thread_status(struct jobs_eta *je)
        }
 
        p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open);
-       if (je->m_rate || je->t_rate) {
+       if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
                char *tr, *mr;
 
-               mr = num2str(je->m_rate, 4, 0, je->is_pow2);
-               tr = num2str(je->t_rate, 4, 0, je->is_pow2);
+               mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2);
+               tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
                p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
                free(tr);
                free(mr);
-       } else if (je->m_iops || je->t_iops)
-               p += sprintf(p, ", CR=%d/%d IOPS", je->t_iops, je->m_iops);
+       } else if (je->m_iops[0] || je->m_iops[1] || je->t_iops[0] || je->t_iops[1]) {
+               p += sprintf(p, ", CR=%d/%d IOPS",
+                                       je->t_iops[0] + je->t_iops[1],
+                                       je->m_iops[0] + je->m_iops[1]);
+       }
        if (je->eta_sec != INT_MAX && je->nr_running) {
                char perc_str[32];
                char *iops_str[DDIR_RWDIR_CNT];