X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=a053c8be67051bf9014b2136f927eb9ff92303c5;hp=c2705d26f38bbd82f25b82882aa1f5910901a7d0;hb=c7c6cb4cb3114ec4ce3107e15c184e161b50122e;hpb=37f0c1ae23ad1716403d3d113c3dfdf41c47e329 diff --git a/stat.c b/stat.c index c2705d26..a053c8be 100644 --- a/stat.c +++ b/stat.c @@ -9,7 +9,7 @@ #include "fio.h" #include "diskutil.h" -#include "ieee754.h" +#include "lib/ieee754.h" void update_rusage_stat(struct thread_data *td) { @@ -114,20 +114,28 @@ static int double_cmp(const void *a, const void *b) return cmp; } -/* - * Find and display the p-th percentile of clat - */ -static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, - fio_fp64_t *plist) +static unsigned int calc_clat_percentiles(unsigned int *io_u_plat, + unsigned long nr, fio_fp64_t *plist, + unsigned int **output, + unsigned int *maxv, + unsigned int *minv) { unsigned long sum = 0; unsigned int len, i, j = 0; - int is_last = 0; + unsigned int oval_len = 0; + unsigned int *ovals = NULL; + int is_last; + + *minv = -1U; + *maxv = 0; len = 0; while (len < FIO_IO_U_LIST_MAX_LEN && plist[len].u.f != 0.0) len++; + if (!len) + return 0; + /* * Sort the percentile list. Note that it may already be sorted if * we are using the default values, but since it's a short list this @@ -136,31 +144,94 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, if (len > 1) qsort((void*)plist, len, sizeof(plist[0]), double_cmp); - log_info(" clat percentiles (usec) :"); - + /* + * Calculate bucket values, note down max and min values + */ + is_last = 0; for (i = 0; i < FIO_IO_U_PLAT_NR && !is_last; i++) { sum += io_u_plat[i]; while (sum >= (plist[j].u.f / 100.0 * nr)) { assert(plist[j].u.f <= 100.0); - /* for formatting */ - if (j != 0 && (j % 4) == 0) - log_info(" "); - - /* end of the list */ - is_last = (j == len - 1); + if (j == oval_len) { + oval_len += 100; + ovals = realloc(ovals, oval_len * sizeof(unsigned int)); + } - log_info(" %2.2fth=%u%c", plist[j], plat_idx_to_val(i), - (is_last? '\n' : ',')); + ovals[j] = plat_idx_to_val(i); + if (ovals[j] < *minv) + *minv = ovals[j]; + if (ovals[j] > *maxv) + *maxv = ovals[j]; + is_last = (j == len - 1); if (is_last) break; - if (j % 4 == 3) /* for formatting */ - log_info("\n"); j++; } } + + *output = ovals; + return len; +} + +/* + * Find and display the p-th percentile of clat + */ +static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, + fio_fp64_t *plist) +{ + unsigned int len, j = 0, minv, maxv; + unsigned int *ovals; + int is_last, scale_down; + + len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv); + if (!len) + goto out; + + /* + * We default to usecs, but if the value range is such that we + * should scale down to msecs, do that. + */ + if (minv > 2000 && maxv > 99999) { + scale_down = 1; + log_info(" clat percentiles (msec):\n |"); + } else { + scale_down = 0; + log_info(" clat percentiles (usec):\n |"); + } + + for (j = 0; j < len; j++) { + char fbuf[8]; + + /* for formatting */ + if (j != 0 && (j % 4) == 0) + log_info(" |"); + + /* end of the list */ + is_last = (j == len - 1); + + if (plist[j].u.f < 10.0) + sprintf(fbuf, " %2.2f", plist[j].u.f); + else + sprintf(fbuf, "%2.2f", plist[j].u.f); + + if (scale_down) + ovals[j] = (ovals[j] + 999) / 1000; + + log_info(" %sth=[%5u]%c", fbuf, ovals[j], is_last ? '\n' : ','); + + if (is_last) + break; + + if (j % 4 == 3) /* for formatting */ + log_info("\n"); + } + +out: + if (ovals) + free(ovals); } static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max, @@ -191,7 +262,7 @@ void show_group_stats(struct group_run_stats *rs) const char *ddir_str[] = { " READ", " WRITE" }; int i; - log_info("\nRun status group %d (all jobs):\n", rs->groupid); + log_info("Run status group %d (all jobs):\n", rs->groupid); for (i = 0; i <= DDIR_WRITE; i++) { const int i2p = is_power_of_2(rs->kb_base); @@ -510,16 +581,23 @@ static void show_ddir_status_terse(struct thread_stat *ts, struct group_run_stats *rs, int ddir) { unsigned long min, max; - unsigned long long bw; + unsigned long long bw, iops; + unsigned int *ovals = NULL; double mean, dev; + unsigned int len, minv, maxv; + int i; assert(ddir_rw(ddir)); - bw = 0; - if (ts->runtime[ddir]) - bw = ts->io_bytes[ddir] / ts->runtime[ddir]; + iops = bw = 0; + if (ts->runtime[ddir]) { + uint64_t runt = ts->runtime[ddir]; - log_info(";%llu;%llu;%llu", ts->io_bytes[ddir] >> 10, bw, + bw = ts->io_bytes[ddir] / runt; + iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt; + } + + log_info(";%llu;%llu;%llu;%llu", ts->io_bytes[ddir] >> 10, bw, iops, ts->runtime[ddir]); if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) @@ -537,6 +615,24 @@ static void show_ddir_status_terse(struct thread_stat *ts, else log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0); + if (ts->clat_percentiles) { + len = calc_clat_percentiles(ts->io_u_plat[ddir], + ts->clat_stat[ddir].samples, + ts->percentile_list, &ovals, &maxv, + &minv); + } else + len = 0; + + for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) { + if (i >= len) { + log_info(";0%%=0"); + continue; + } + log_info(";%2.2f%%=%u", ts->percentile_list[i].u.f, ovals[i]); + } + if (ovals) + free(ovals); + if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { double p_of_agg; @@ -546,7 +642,7 @@ static void show_ddir_status_terse(struct thread_stat *ts, log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0); } -#define FIO_TERSE_VERSION "2" +#define FIO_TERSE_VERSION "3" static void show_thread_status_terse(struct thread_stat *ts, struct group_run_stats *rs) @@ -595,6 +691,10 @@ static void show_thread_status_terse(struct thread_stat *ts, /* Millisecond latency */ for (i = 0; i < FIO_IO_U_LAT_M_NR; i++) log_info(";%3.2f%%", io_u_lat_m[i]); + + /* disk util stats, if any */ + show_disk_util(1); + /* Additional output if continue_on_error set - default off*/ if (ts->continue_on_error) log_info(";%lu;%d", ts->total_err_count, ts->first_error); @@ -907,7 +1007,12 @@ void show_run_stats(void) show_group_stats(rs); } - show_disk_util(); + if (is_backend) + fio_server_send_du(); + else + show_disk_util(0); + + free_disk_util(); } free(runstats);