[PATCH] Cleanup some output code

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/eta.c b/eta.c
index 5ea429404945bb63a6f63989b4df6bf50757af60..25eaf1a35fe359dfb79c662e16385f2cd95a67ee 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -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);
        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);

diff --git a/init.c b/init.c
index 374d10ad0b7001932afec92b6b54cecd98b56370..611aa9c06bafeca927fbbb0db4bb3aeebe430208 100644 (file)
--- a/init.c
+++ b/init.c
@@ -756,7 +756,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                                c3 = to_kmg(td->min_bs[DDIR_WRITE]);
                                c4 = to_kmg(td->max_bs[DDIR_WRITE]);
 
-                               fprintf(f_out, "%s: (g=%d): rw=%s, odir=%u, bs=%s-%s/%s-%s, rate=%u, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+                               fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
 
                                free(c1);
                                free(c2);