Merge branch 'percentiles' of https://github.com/sitsofe/fio

diff --git a/init.c b/init.c
index f7d79c1c8a210b0eb5530602b881f18178eccffb..decd3b4e051c3c3cffdd4e66fa39bb37243da5df 100644 (file)
--- a/init.c
+++ b/init.c
@@ -938,6 +938,11 @@ static int fixup_options(struct thread_data *td)
                ret = 1;
        }
 
+       if (o->disable_lat)
+               o->lat_percentiles = 0;
+       if (o->disable_clat)
+               o->clat_percentiles = 0;
+
        /*
         * Fix these up to be nsec internally
         */

diff --git a/stat.c b/stat.c
index 863aa45dbc1092e21738837bd82162b74b217a02..cc171a4d52ff69dab7df15037a7b89996e05ecaa 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -460,8 +460,15 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                display_lat(" lat", min, max, mean, dev, out);
 
        if (ts->clat_percentiles || ts->lat_percentiles) {
+               uint64_t samples;
+
+               if (ts->clat_percentiles)
+                       samples = ts->clat_stat[ddir].samples;
+               else
+                       samples = ts->lat_stat[ddir].samples;
+
                show_clat_percentiles(ts->io_u_plat[ddir],
-                                       ts->clat_stat[ddir].samples,
+                                       samples,
                                        ts->percentile_list,
                                        ts->percentile_precision,
                                        ts->clat_percentiles, out);