[PATCH] fio: fix parameters after -f and fix recent variance prints

diff --git a/fio.c b/fio.c
index af496b12ab5055a330a9abcb9aba13a183f53a94..b90036f796b698afb0a12dbed0d785663d4d3b3d 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -674,8 +674,7 @@ static void *thread_main(int shm_id, int offset, char *argv[])
                goto err;
        }
 
-       printf("Thread (%s) (pid=%u) (f=%s) (aio=%d) started\n", td->ddir == DDIR_READ ? "read" : "write", td->pid, td->file_name, td->aio_depth);
-       fflush(stdout);
+       printf("Client%d (pid=%u) started\n", td->thread_number, td->pid);
 
        sprintf(argv[0], "fio%d", offset);
 
@@ -788,7 +787,7 @@ static void show_thread_status(struct thread_data *td)
        m_bw = (double) td->stat_bw / n_bw;
        dev_bw = sqrt(((double) td->stat_bw_sq - (m_bw * m_bw) / n_bw) / (n_bw - 1));
 
-       printf("Client%d: err=%2d, io=%6luMiB, bw=%6luKiB/sec, latmax=%5lu, latavg=%5.02f, latdev=%5.02f, m_bw=%5.02f, m_dev=%5.02f\n", td->thread_number, td->error, td->io_blocks * td->bs >> 20, bw, td->max_latency, m_lat, dev_lat, m_bw, dev_bw);
+       printf("Client%d: err=%2d, io=%6luMiB, bw=%6luKiB/sec, latmax=%5lumsec, latavg=%5.02fmsec, latdev=%5.02fmsec, bwavg=%5.02fKiB/sec, bwdev=%5.02fKiB/sec\n", td->thread_number, td->error, td->io_blocks * td->bs >> 20, bw, td->max_latency, m_lat, dev_lat, m_bw, dev_bw);
 }
 
 static int setup_rate(struct thread_data *td)
@@ -1251,6 +1250,7 @@ static int parse_options(int argc, char *argv[])
                                        break;
                                }
                                ini_file = strdup(argv[i+1]);
+                               i++;
                                break;
                        default:
                                printf("bad option %s\n", argv[i]);
@@ -1418,8 +1418,6 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       printf("%s: %s, bs=%uKiB, timeo=%u, odirect=%d\n", argv[0], def_thread.sequential ? "sequential" : "random", def_thread.bs >> 10, def_thread.timeout, def_thread.odirect);
-
        run_threads(argv);
 
        min_bw[0] = min_run[0] = ~0UL;