[PATCH] Unlink write file if !overwrite and it exists

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 99e59ec51d78d4bac7ff45180f16f3ce9407a7d2..3ffb1114783892da44cf8c1dd5c382ae9b0037c8 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -84,15 +84,15 @@ static void eta_to_str(char *str, int eta_sec)
 
        if (d || always_d) {
                always_d = 1;
-               str += sprintf(str, "%02dd:", d);
+               str += sprintf(str, "%02ud:", d);
        }
        if (h || always_h) {
                always_h = 1;
-               str += sprintf(str, "%02dh:", h);
+               str += sprintf(str, "%02uh:", h);
        }
 
-       str += sprintf(str, "%02dm:", m);
-       str += sprintf(str, "%02ds", s);
+       str += sprintf(str, "%02um:", m);
+       str += sprintf(str, "%02us", s);
 }
 
 /*
@@ -101,7 +101,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 +127,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;
@@ -245,12 +245,12 @@ void print_thread_status(void)
        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] [%6u/%6u kb/s] [eta %s]", run_str, perc, r_rate, w_rate, 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);