Fix parser bug
[fio.git] / eta.c
diff --git a/eta.c b/eta.c
index 9ad0b49bdb5b1798d5c3bbe77f9c5d08892f7a52..960bf4d1b9f0e53e2a1515541ae3174e7a17e87a 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -26,20 +26,20 @@ static void check_str_update(struct thread_data *td)
                        break;
                case TD_RUNNING:
                        if (td_rw(td)) {
-                               if (td->sequential)
-                                       c = 'M';
-                               else
+                               if (td_random(td))
                                        c = 'm';
-                       } else if (td_read(td)) {
-                               if (td->sequential)
-                                       c = 'R';
                                else
+                                       c = 'M';
+                       } else if (td_read(td)) {
+                               if (td_random(td))
                                        c = 'r';
-                       } else {
-                               if (td->sequential)
-                                       c = 'W';
                                else
+                                       c = 'R';
+                       } else {
+                               if (td_random(td))
                                        c = 'w';
+                               else
+                                       c = 'W';
                        }
                        break;
                case TD_VERIFYING:
@@ -70,7 +70,7 @@ static void check_str_update(struct thread_data *td)
 static void eta_to_str(char *str, int eta_sec)
 {
        unsigned int d, h, m, s;
-       static int always_d, always_h;
+       int disp_hour = 0;
 
        d = h = m = s = 0;
 
@@ -82,17 +82,16 @@ static void eta_to_str(char *str, int eta_sec)
        eta_sec /= 24;
        d = eta_sec;
 
-       if (d || always_d) {
-               always_d = 1;
-               str += sprintf(str, "%02dd:", d);
-       }
-       if (h || always_h) {
-               always_h = 1;
-               str += sprintf(str, "%02dh:", h);
+       if (d) {
+               disp_hour = 1;
+               str += sprintf(str, "%02ud:", d);
        }
 
-       str += sprintf(str, "%02dm:", m);
-       str += sprintf(str, "%02ds", s);
+       if (h || disp_hour)
+               str += sprintf(str, "%02uh:", h);
+
+       str += sprintf(str, "%02um:", m);
+       str += sprintf(str, "%02us", s);
 }
 
 /*
@@ -101,10 +100,21 @@ static void eta_to_str(char *str, int eta_sec)
 static int thread_eta(struct thread_data *td, unsigned long elapsed)
 {
        unsigned long long bytes_total, bytes_done;
-       unsigned int eta_sec = 0;
+       unsigned long eta_sec = 0;
 
        bytes_total = td->total_io_size;
 
+       /*
+        * if writing, bytes_total will be twice the size. If mixing,
+        * assume a 50/50 split and thus bytes_total will be 50% larger.
+        */
+       if (td->verify) {
+               if (td_rw(td))
+                       bytes_total = bytes_total * 3 / 2;
+               else
+                       bytes_total <<= 1;
+       }
+
        if (td->zone_size && td->zone_skip)
                bytes_total /= (td->zone_skip / td->zone_size);
 
@@ -116,7 +126,7 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
                if (perc > 1.0)
                        perc = 1.0;
 
-               eta_sec = (elapsed * (1.0 / perc)) - elapsed;
+               eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
 
                if (td->timeout && eta_sec > (td->timeout - elapsed))
                        eta_sec = td->timeout - elapsed;
@@ -153,6 +163,15 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
        return eta_sec;
 }
 
+static void calc_rate(unsigned long mtime, unsigned long long *io_bytes,
+                     unsigned long long *prev_io_bytes, unsigned int *rate)
+{
+       rate[0] = (io_bytes[0] - prev_io_bytes[0]) / mtime;
+       rate[1] = (io_bytes[1] - prev_io_bytes[1]) / mtime;
+       prev_io_bytes[0] = io_bytes[0];
+       prev_io_bytes[1] = io_bytes[1];
+}
+       
 /*
  * Print status of the jobs we know about. This includes rate estimates,
  * ETA, thread state, etc.
@@ -161,21 +180,37 @@ void print_thread_status(void)
 {
        unsigned long elapsed = mtime_since_genesis() / 1000;
        int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec;
-       char eta_str[32];
+       struct thread_data *td;
+       char eta_str[128];
        double perc = 0.0;
+       unsigned long long io_bytes[2];
+       unsigned long rate_time, disp_time, bw_avg_time;
+       struct timeval now;
+
+       static unsigned long long rate_io_bytes[2];
+       static unsigned long long disp_io_bytes[2];
+       static struct timeval rate_prev_time, disp_prev_time;
+       static unsigned int rate[2];
 
        if (temp_stall_ts || terse_output)
                return;
 
+       if (!rate_io_bytes[0] && !rate_io_bytes[1])
+               fill_start_time(&rate_prev_time);
+       if (!disp_io_bytes[0] && !disp_io_bytes[1])
+               fill_start_time(&disp_prev_time);
+
        eta_secs = malloc(thread_number * sizeof(int));
        memset(eta_secs, 0, thread_number * sizeof(int));
 
+       io_bytes[0] = io_bytes[1] = 0;
        nr_pending = nr_running = t_rate = m_rate = 0;
-       for (i = 0; i < thread_number; i++) {
-               struct thread_data *td = &threads[i];
-
-               if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING||
-                   td->runstate == TD_FSYNCING) {
+       bw_avg_time = ULONG_MAX;
+       for_each_td(td, i) {
+               if (td->bw_avg_time < bw_avg_time)
+                       bw_avg_time = td->bw_avg_time;
+               if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
+                   || td->runstate == TD_FSYNCING) {
                        nr_running++;
                        t_rate += td->rate;
                        m_rate += td->ratemin;
@@ -188,6 +223,8 @@ void print_thread_status(void)
                        eta_secs[i] = INT_MAX;
 
                check_str_update(td);
+               io_bytes[0] += td->io_bytes[0];
+               io_bytes[1] += td->io_bytes[1];
        }
 
        if (exitall_on_terminate)
@@ -195,7 +232,7 @@ void print_thread_status(void)
        else
                eta_sec = 0;
 
-       for (i = 0; i < thread_number; i++) {
+       for_each_td(td, i) {
                if (exitall_on_terminate) {
                        if (eta_secs[i] < eta_sec)
                                eta_sec = eta_secs[i];
@@ -205,24 +242,42 @@ void print_thread_status(void)
                }
        }
 
+       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) {
+               calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
+               memcpy(&rate_prev_time, &now, sizeof(now));
+               add_agg_sample(rate[DDIR_READ], DDIR_READ);
+               add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE);
+       }
+
+       disp_time = mtime_since(&disp_prev_time, &now);
+       if (disp_time < 1000)
+               return;
+
+       calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+       memcpy(&disp_prev_time, &now, sizeof(now));
+
        if (!nr_running && !nr_pending)
                return;
 
-       printf("Threads running: %d", nr_running);
+       printf("Threads: %d", nr_running);
        if (m_rate || t_rate)
-               printf(", commitrate %d/%dKiB/sec", t_rate, m_rate);
+               printf(", CR=%d/%d KiB/s", t_rate, m_rate);
        if (eta_sec != INT_MAX && nr_running) {
                perc *= 100.0;
-               printf(": [%s] [%3.2f%% done] [eta %s]", run_str, perc,eta_str);
+               printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);
        }
        printf("\r");
        fflush(stdout);
-       free(eta_secs);
 }
 
 void print_status_init(int thread_number)