stat: simplify add_lat_percentile_prio_sample()

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 28e49a89bf3a52bf3f139a61c85258d4118bba2a..f78899c8ce36a6be0e121073898e6e36b9c53cbd 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -3065,12 +3065,10 @@ static void add_lat_percentile_sample(struct thread_stat *ts,
 static void add_lat_percentile_prio_sample(struct thread_stat *ts,
                                           unsigned long long nsec,
                                           enum fio_ddir ddir,
-                                          bool high_prio, enum fio_lat lat)
+                                          bool high_prio)
 {
        unsigned int idx = plat_val_to_idx(nsec);
 
-       add_lat_percentile_sample(ts, nsec, ddir, lat);
-
        if (!high_prio)
                ts->io_u_plat_low_prio[ddir][idx]++;
        else
@@ -3117,11 +3115,10 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
                 * sample only when lat_percentiles=0. add_lat_sample() will add
                 * the prio lat percentile sample when lat_percentiles=1.
                 */
-               if (ts->lat_percentiles)
-                       add_lat_percentile_sample(ts, nsec, ddir, FIO_CLAT);
-               else
-                       add_lat_percentile_prio_sample(ts, nsec, ddir, high_prio,
-                                                      FIO_CLAT);
+               add_lat_percentile_sample(ts, nsec, ddir, FIO_CLAT);
+               if (!ts->lat_percentiles)
+                       add_lat_percentile_prio_sample(ts, nsec, ddir,
+                                                      high_prio);
        }
 
        if (iolog && iolog->hist_msec) {
@@ -3222,8 +3219,8 @@ void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
         * lat_percentiles=0.
         */
        if (ts->lat_percentiles) {
-               add_lat_percentile_prio_sample(ts, nsec, ddir, high_prio,
-                                              FIO_LAT);
+               add_lat_percentile_sample(ts, nsec, ddir, FIO_LAT);
+               add_lat_percentile_prio_sample(ts, nsec, ddir, high_prio);
                if (high_prio)
                        add_stat_sample(&ts->clat_high_prio_stat[ddir], nsec);
                else