Abstract out calculation of ETA from display of ETA

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/eta.c b/eta.c
index fc0292f3d7ac6c2e9b4ef5da5ecd29397572a274..2c15b24e812ab580e32c8f2ca58808a374835d83 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -230,33 +230,26 @@ static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
  * Print status of the jobs we know about. This includes rate estimates,
  * ETA, thread state, etc.
  */
-void print_thread_status(void)
+int calc_thread_status(struct jobs_eta *je)
 {
-       unsigned long elapsed = (mtime_since_genesis() + 999) / 1000;
-       int i, nr_ramp, nr_running, nr_pending, t_rate, m_rate;
-       int t_iops, m_iops, files_open;
        struct thread_data *td;
-       char eta_str[128];
-       double perc = 0.0;
-       unsigned long long io_bytes[2], io_iops[2];
-       unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
+       int i;
+       unsigned long rate_time, disp_time, bw_avg_time, *eta_secs;
+       unsigned long long io_bytes[2];
+       unsigned long long io_iops[2];
        struct timeval now;
 
        static unsigned long long rate_io_bytes[2];
        static unsigned long long disp_io_bytes[2];
        static unsigned long long disp_io_iops[2];
        static struct timeval rate_prev_time, disp_prev_time;
-       static unsigned int rate[2], iops[2];
-       static int linelen_last;
-       static int eta_good;
-       char output[512], *p = output;
        int i2p = 0;
 
        if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
-               return;
+               return 0;
 
        if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
-               return;
+               return 0;
 
        if (!rate_io_bytes[0] && !rate_io_bytes[1])
                fill_start_time(&rate_prev_time);
@@ -266,32 +259,31 @@ void print_thread_status(void)
        eta_secs = malloc(thread_number * sizeof(unsigned long));
        memset(eta_secs, 0, thread_number * sizeof(unsigned long));
 
+       je->elapsed_sec = (mtime_since_genesis() + 999) / 1000;
+
        io_bytes[0] = io_bytes[1] = 0;
        io_iops[0] = io_iops[1] = 0;
-       nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
-       nr_ramp = 0;
        bw_avg_time = ULONG_MAX;
-       files_open = 0;
        for_each_td(td, i) {
                if (td->o.bw_avg_time < bw_avg_time)
                        bw_avg_time = td->o.bw_avg_time;
                if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
                    || td->runstate == TD_FSYNCING
                    || td->runstate == TD_PRE_READING) {
-                       nr_running++;
-                       t_rate += td->o.rate[0] + td->o.rate[1];
-                       m_rate += td->o.ratemin[0] + td->o.ratemin[1];
-                       t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
-                       m_iops += td->o.rate_iops_min[0] +
+                       je->nr_running++;
+                       je->t_rate += td->o.rate[0] + td->o.rate[1];
+                       je->m_rate += td->o.ratemin[0] + td->o.ratemin[1];
+                       je->t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
+                       je->m_iops += td->o.rate_iops_min[0] +
                                        td->o.rate_iops_min[1];
-                       files_open += td->nr_open_files;
+                       je->files_open += td->nr_open_files;
                } else if (td->runstate == TD_RAMP) {
-                       nr_running++;
-                       nr_ramp++;
+                       je->nr_running++;
+                       je->nr_ramp++;
                } else if (td->runstate < TD_RUNNING)
-                       nr_pending++;
+                       je->nr_pending++;
 
-               if (elapsed >= 3)
+               if (je->elapsed_sec >= 3)
                        eta_secs[i] = thread_eta(td);
                else
                        eta_secs[i] = INT_MAX;
@@ -307,37 +299,32 @@ void print_thread_status(void)
        }
 
        if (exitall_on_terminate)
-               eta_sec = INT_MAX;
+               je->eta_sec = INT_MAX;
        else
-               eta_sec = 0;
+               je->eta_sec = 0;
 
        for_each_td(td, i) {
                if (!i2p && is_power_of_2(td->o.kb_base))
                        i2p = 1;
                if (exitall_on_terminate) {
-                       if (eta_secs[i] < eta_sec)
-                               eta_sec = eta_secs[i];
+                       if (eta_secs[i] < je->eta_sec)
+                               je->eta_sec = eta_secs[i];
                } else {
-                       if (eta_secs[i] > eta_sec)
-                               eta_sec = eta_secs[i];
+                       if (eta_secs[i] > je->eta_sec)
+                               je->eta_sec = eta_secs[i];
                }
        }
 
        free(eta_secs);
 
-       if (eta_sec != INT_MAX && elapsed) {
-               perc = (double) elapsed / (double) (elapsed + eta_sec);
-               eta_to_str(eta_str, eta_sec);
-       }
-
        fio_gettime(&now, NULL);
        rate_time = mtime_since(&rate_prev_time, &now);
 
        if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) {
-               calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
+               calc_rate(rate_time, io_bytes, rate_io_bytes, je->rate);
                memcpy(&rate_prev_time, &now, sizeof(now));
-               add_agg_sample(rate[DDIR_READ], DDIR_READ, 0);
-               add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE, 0);
+               add_agg_sample(je->rate[DDIR_READ], DDIR_READ, 0);
+               add_agg_sample(je->rate[DDIR_WRITE], DDIR_WRITE, 0);
        }
 
        disp_time = mtime_since(&disp_prev_time, &now);
@@ -346,34 +333,57 @@ void print_thread_status(void)
         * Allow a little slack, the target is to print it every 1000 msecs
         */
        if (disp_time < 900)
-               return;
+               return 0;
 
-       calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
-       calc_iops(disp_time, io_iops, disp_io_iops, iops);
+       calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate);
+       calc_iops(disp_time, io_iops, disp_io_iops, je->iops);
 
        memcpy(&disp_prev_time, &now, sizeof(now));
 
-       if (!nr_running && !nr_pending)
+       if (!je->nr_running && !je->nr_pending)
+               return 0;
+
+       return 1;
+}
+
+void print_thread_status(void)
+{
+       struct jobs_eta je;
+       static int linelen_last;
+       static int eta_good;
+       char output[512], *p = output;
+       char eta_str[128];
+       double perc = 0.0;
+       int i2p = 0;
+
+       memset(&je, 0, sizeof(je));
+
+       if (!calc_thread_status(&je))
                return;
 
-       p += sprintf(p, "Jobs: %d (f=%d)", nr_running, files_open);
-       if (m_rate || t_rate) {
+       if (je.eta_sec != INT_MAX && je.elapsed_sec) {
+               perc = (double) je.elapsed_sec / (double) (je.elapsed_sec + je.eta_sec);
+               eta_to_str(eta_str, je.eta_sec);
+       }
+
+       p += sprintf(p, "Jobs: %d (f=%d)", je.nr_running, je.files_open);
+       if (je.m_rate || je.t_rate) {
                char *tr, *mr;
 
-               mr = num2str(m_rate, 4, 0, i2p);
-               tr = num2str(t_rate, 4, 0, i2p);
+               mr = num2str(je.m_rate, 4, 0, i2p);
+               tr = num2str(je.t_rate, 4, 0, i2p);
                p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
                free(tr);
                free(mr);
-       } else if (m_iops || t_iops)
-               p += sprintf(p, ", CR=%d/%d IOPS", t_iops, m_iops);
-       if (eta_sec != INT_MAX && nr_running) {
+       } else if (je.m_iops || je.t_iops)
+               p += sprintf(p, ", CR=%d/%d IOPS", je.t_iops, je.m_iops);
+       if (je.eta_sec != INT_MAX && je.nr_running) {
                char perc_str[32];
                char *iops_str[2];
                char *rate_str[2];
                int l;
 
-               if ((!eta_sec && !eta_good) || nr_ramp == nr_running)
+               if ((!je.eta_sec && !eta_good) || je.nr_ramp == je.nr_running)
                        strcpy(perc_str, "-.-% done");
                else {
                        eta_good = 1;
@@ -381,11 +391,11 @@ void print_thread_status(void)
                        sprintf(perc_str, "%3.1f%% done", perc);
                }
 
-               rate_str[0] = num2str(rate[0], 5, 10, i2p);
-               rate_str[1] = num2str(rate[1], 5, 10, i2p);
+               rate_str[0] = num2str(je.rate[0], 5, 10, i2p);
+               rate_str[1] = num2str(je.rate[1], 5, 10, i2p);
 
-               iops_str[0] = num2str(iops[0], 4, 1, 0);
-               iops_str[1] = num2str(iops[1], 4, 1, 0);
+               iops_str[0] = num2str(je.iops[0], 4, 1, 0);
+               iops_str[1] = num2str(je.iops[1], 4, 1, 0);
 
                l = sprintf(p, ": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
                                 run_str, perc_str, rate_str[0], rate_str[1],
@@ -409,6 +419,7 @@ void print_thread_status(void)
                fio_server_text_output(output, p - output);
 }
 
+
 void print_status_init(int thr_number)
 {
        run_str[thr_number] = 'P';

diff --git a/stat.h b/stat.h
index cba871458cf78292eb42b3097aa781a45a954bd9..289223cbe814e2b90d9d26b0ab272edbb3dc0e99 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -168,6 +168,19 @@ struct thread_stat {
        uint32_t kb_base;
 };
 
+struct jobs_eta {
+       uint32_t nr_running;
+       uint32_t nr_ramp;
+       uint32_t nr_pending;
+       uint32_t files_open;
+       uint32_t m_rate, t_rate;
+       uint32_t m_iops, t_iops;
+       uint32_t rate[2];
+       uint32_t iops[2];
+       uint64_t elapsed_sec;
+       uint64_t eta_sec;
+};
+
 extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs);
 extern void show_group_stats(struct group_run_stats *rs);