stats: Add a function to report completion latency percentiles

[fio.git] / init.c

diff --git a/init.c b/init.c
index 4e7eb4989976ad86c32910e7b2144d260cfc497f..a920c6ed87e71e8b0399708fcb12ac0d6361c88a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.55";
+static char fio_version_string[] = "fio 1.57";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -47,7 +47,6 @@ int warnings_fatal = 0;
 int write_bw_log = 0;
 int read_only = 0;
 
-static int def_timeout;
 static int write_lat_log;
 
 static int prev_group_jobs;
@@ -617,6 +616,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        td->mutex = fio_mutex_init(0);
 
+       td->ts.clat_percentiles = td->o.clat_percentiles;
+       if (td->o.overwrite_plist)
+               td->ts.percentile_list = td->o.percentile_list;
+       else
+               td->ts.percentile_list = NULL;
+
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
        td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
@@ -951,8 +956,6 @@ static int fill_def_thread(void)
         * fill default options
         */
        fio_fill_default_options(&def_thread);
-
-       def_thread.o.timeout = def_timeout;
        return 0;
 }
 
@@ -1024,6 +1027,7 @@ static int setup_thread_area(void)
 
 static void usage(const char *name)
 {
+       printf("%s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
        printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
@@ -1160,7 +1164,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        smalloc_pool_size = atoi(optarg);
                        break;
                case 't':
-                       def_timeout = atoi(optarg);
+                       def_thread.o.timeout = atoi(optarg);
                        break;
                case 'l':
                        write_lat_log = 1;