X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=98b9ad2f8ffffbc229e38aa941fcd4cfda31ce4c;hp=c921f5f4379187e5affa6622f360f489b8fce92d;hb=b29ad56266faa33326de00e315d2b34b735fb028;hpb=7fb28d3661a5833d8be24a014a04ee4548ec1c16 diff --git a/stat.c b/stat.c index c921f5f4..98b9ad2f 100644 --- a/stat.c +++ b/stat.c @@ -234,8 +234,8 @@ out: free(ovals); } -static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max, - double *mean, double *dev) +int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max, + double *mean, double *dev) { double n = is->samples; @@ -339,18 +339,23 @@ static void stat_calc_lat_m(struct thread_stat *ts, double *io_u_lat) stat_calc_lat(ts, io_u_lat, ts->io_u_lat_m, FIO_IO_U_LAT_M_NR); } -static int usec_to_msec(unsigned long *min, unsigned long *max, double *mean, - double *dev) +static void display_lat(const char *name, unsigned long min, unsigned long max, + double mean, double dev) { - if (*min > 1000 && *max > 1000 && *mean > 1000.0 && *dev > 1000.0) { - *min /= 1000; - *max /= 1000; - *mean /= 1000.0; - *dev /= 1000.0; - return 0; - } + const char *base = "(usec)"; + char *minp, *maxp; - return 1; + if (!usec_to_msec(&min, &max, &mean, &dev)) + base = "(msec)"; + + minp = num2str(min, 6, 1, 0); + maxp = num2str(max, 6, 1, 0); + + log_info(" %s %s: min=%s, max=%s, avg=%5.02f," + " stdev=%5.02f\n", name, base, minp, maxp, mean, dev); + + free(minp); + free(maxp); } static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, @@ -386,66 +391,27 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, free(bw_p); free(iops_p); - if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) { - const char *base = "(usec)"; - char *minp, *maxp; - - if (!usec_to_msec(&min, &max, &mean, &dev)) - base = "(msec)"; - - minp = num2str(min, 6, 1, 0); - maxp = num2str(max, 6, 1, 0); - - log_info(" slat %s: min=%s, max=%s, avg=%5.02f," - " stdev=%5.02f\n", base, minp, maxp, mean, dev); - - free(minp); - free(maxp); - } - if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) { - const char *base = "(usec)"; - char *minp, *maxp; - - if (!usec_to_msec(&min, &max, &mean, &dev)) - base = "(msec)"; - - minp = num2str(min, 6, 1, 0); - maxp = num2str(max, 6, 1, 0); - - log_info(" clat %s: min=%s, max=%s, avg=%5.02f," - " stdev=%5.02f\n", base, minp, maxp, mean, dev); - - free(minp); - free(maxp); - } - if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev)) { - const char *base = "(usec)"; - char *minp, *maxp; - - if (!usec_to_msec(&min, &max, &mean, &dev)) - base = "(msec)"; - - minp = num2str(min, 6, 1, 0); - maxp = num2str(max, 6, 1, 0); - - log_info(" lat %s: min=%s, max=%s, avg=%5.02f," - " stdev=%5.02f\n", base, minp, maxp, mean, dev); + if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) + display_lat("slat", min, max, mean, dev); + if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) + display_lat("clat", min, max, mean, dev); + if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev)) + display_lat(" lat", min, max, mean, dev); - free(minp); - free(maxp); - } if (ts->clat_percentiles) { show_clat_percentiles(ts->io_u_plat[ddir], ts->clat_stat[ddir].samples, ts->percentile_list); } if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { - double p_of_agg; + double p_of_agg = 100.0; const char *bw_str = "KB"; - p_of_agg = mean * 100 / (double) rs->agg[ddir]; - if (p_of_agg > 100.0) - p_of_agg = 100.0; + if (rs->agg[ddir]) { + p_of_agg = mean * 100 / (double) rs->agg[ddir]; + if (p_of_agg > 100.0) + p_of_agg = 100.0; + } if (mean > 999999.9) { min /= 1000.0; @@ -653,9 +619,14 @@ static void show_ddir_status_terse(struct thread_stat *ts, free(ovals); if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { - double p_of_agg; + double p_of_agg = 100.0; + + if (rs->agg[ddir]) { + p_of_agg = mean * 100 / (double) rs->agg[ddir]; + if (p_of_agg > 100.0) + p_of_agg = 100.0; + } - p_of_agg = mean * 100 / (double) rs->agg[ddir]; log_info(";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev); } else log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0); @@ -1285,15 +1256,26 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs, if (spent < td->o.bw_avg_time) return; - rate = (td->this_io_bytes[ddir] - td->stat_io_bytes[ddir]) * - 1000 / spent / 1024; - add_stat_sample(&ts->bw_stat[ddir], rate); + /* + * Compute both read and write rates for the interval. + */ + for (ddir = DDIR_READ; ddir <= DDIR_WRITE; ddir++) { + uint64_t delta; + + delta = td->this_io_bytes[ddir] - td->stat_io_bytes[ddir]; + if (!delta) + continue; /* No entries for interval */ + + rate = delta * 1000 / spent / 1024; + add_stat_sample(&ts->bw_stat[ddir], rate); - if (td->bw_log) - add_log_sample(td, td->bw_log, rate, ddir, bs); + if (td->bw_log) + add_log_sample(td, td->bw_log, rate, ddir, bs); + + td->stat_io_bytes[ddir] = td->this_io_bytes[ddir]; + } fio_gettime(&td->bw_sample_time, NULL); - td->stat_io_bytes[ddir] = td->this_io_bytes[ddir]; } void add_iops_sample(struct thread_data *td, enum fio_ddir ddir, @@ -1309,15 +1291,24 @@ void add_iops_sample(struct thread_data *td, enum fio_ddir ddir, if (spent < td->o.iops_avg_time) return; - iops = ((td->this_io_blocks[ddir] - td->stat_io_blocks[ddir]) * 1000) / spent; + /* + * Compute both read and write rates for the interval. + */ + for (ddir = DDIR_READ; ddir <= DDIR_WRITE; ddir++) { + uint64_t delta; + + delta = td->this_io_blocks[ddir] - td->stat_io_blocks[ddir]; + if (!delta) + continue; /* No entries for interval */ + + iops = (delta * 1000) / spent; + add_stat_sample(&ts->iops_stat[ddir], iops); - add_stat_sample(&ts->iops_stat[ddir], iops); + if (td->iops_log) + add_log_sample(td, td->iops_log, iops, ddir, 0); - if (td->iops_log) { - assert(iops); - add_log_sample(td, td->iops_log, iops, ddir, 0); + td->stat_io_blocks[ddir] = td->this_io_blocks[ddir]; } fio_gettime(&td->iops_sample_time, NULL); - td->stat_io_blocks[ddir] = td->this_io_blocks[ddir]; }