[PATCH] SG IO engine: reduce allocations and memory leaks

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 8cf9ea25eb6127f675c5a16d4a4d02a9ecf6d596..fc485985ec6a833eaf57f26c83cac8d4689e1e15 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -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,7 +100,7 @@ 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;
 
@@ -127,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;
@@ -176,14 +175,27 @@ void print_thread_status(void)
        char eta_str[32];
        double perc = 0.0;
 
+       static unsigned long long prev_io_bytes[2];
+       static struct timeval prev_time;
+       static unsigned int r_rate, w_rate;
+       unsigned long long io_bytes[2];
+       unsigned long mtime, bw_avg_time;
+
        if (temp_stall_ts || terse_output)
                return;
 
+       if (!prev_io_bytes[0] && !prev_io_bytes[1])
+               fill_start_time(&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;
+       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++;
@@ -198,6 +210,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)
@@ -222,15 +236,27 @@ void print_thread_status(void)
                eta_to_str(eta_str, eta_sec);
        }
 
+       mtime = mtime_since_now(&prev_time);
+       if (mtime > bw_avg_time) {
+               r_rate = (io_bytes[0] - prev_io_bytes[0]) / mtime;
+               w_rate = (io_bytes[1] - prev_io_bytes[1]) / mtime;
+               fio_gettime(&prev_time, NULL);
+               if (write_bw_log) {
+                       add_agg_sample(r_rate, DDIR_READ);
+                       add_agg_sample(w_rate, DDIR_WRITE);
+               }
+               memcpy(prev_io_bytes, io_bytes, sizeof(io_bytes));
+       }
+
        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, r_rate, w_rate, eta_str);
        }
        printf("\r");
        fflush(stdout);