X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=1effbfe9c5b452c625574a3cce02bd87ccdb074a;hp=1201c35c703bd5f81d8dd6496d3a9b3754268deb;hb=b02e3212f23d0957f47e88b1a6cf7517dbd72e3f;hpb=bef2112bb7bfa9e4fb74bb57b37b69f6111ed27a diff --git a/stat.c b/stat.c index 1201c35c..1effbfe9 100644 --- a/stat.c +++ b/stat.c @@ -1,10 +1,7 @@ #include #include #include -#include #include -#include -#include #include #include "fio.h" @@ -18,9 +15,9 @@ #include "helper_thread.h" #include "smalloc.h" -#define LOG_MSEC_SLACK 10 +#define LOG_MSEC_SLACK 1 -struct fio_mutex *stat_mutex; +struct fio_sem *stat_sem; void clear_rusage_stat(struct thread_data *td) { @@ -100,7 +97,8 @@ static unsigned int plat_val_to_idx(unsigned long long val) */ static unsigned long long plat_idx_to_val(unsigned int idx) { - unsigned int error_bits, k, base; + unsigned int error_bits; + unsigned long long k, base; assert(idx < FIO_IO_U_PLAT_NR); @@ -111,7 +109,7 @@ static unsigned long long plat_idx_to_val(unsigned int idx) /* Find the group and compute the minimum value of that group */ error_bits = (idx >> FIO_IO_U_PLAT_BITS) - 1; - base = 1 << (error_bits + FIO_IO_U_PLAT_BITS); + base = ((unsigned long long) 1) << (error_bits + FIO_IO_U_PLAT_BITS); /* Find its bucket number of the group */ k = idx % FIO_IO_U_PLAT_VAL; @@ -134,15 +132,15 @@ static int double_cmp(const void *a, const void *b) return cmp; } -unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, +unsigned int calc_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr, fio_fp64_t *plist, unsigned long long **output, unsigned long long *maxv, unsigned long long *minv) { - unsigned long sum = 0; + unsigned long long sum = 0; unsigned int len, i, j = 0; unsigned int oval_len = 0; unsigned long long *ovals = NULL; - int is_last; + bool is_last; *minv = -1ULL; *maxv = 0; @@ -165,7 +163,7 @@ unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, /* * Calculate bucket values, note down max and min values */ - is_last = 0; + is_last = false; 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)) { @@ -182,7 +180,7 @@ unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, if (ovals[j] > *maxv) *maxv = ovals[j]; - is_last = (j == len - 1); + is_last = (j == len - 1) != 0; if (is_last) break; @@ -197,18 +195,19 @@ unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, /* * Find and display the p-th percentile of clat */ -static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, +static void show_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr, fio_fp64_t *plist, unsigned int precision, - struct buf_output *out) + const char *pre, struct buf_output *out) { unsigned int divisor, len, i, j = 0; unsigned long long minv, maxv; unsigned long long *ovals; - int is_last, per_line, scale_down, time_width; + int per_line, scale_down, time_width; + bool is_last; char fmt[32]; len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv); - if (!len) + if (!len || !ovals) goto out; /* @@ -218,15 +217,15 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, if (minv > 2000000 && maxv > 99999999ULL) { scale_down = 2; divisor = 1000000; - log_buf(out, " clat percentiles (msec):\n |"); + log_buf(out, " %s percentiles (msec):\n |", pre); } else if (minv > 2000 && maxv > 99999) { scale_down = 1; divisor = 1000; - log_buf(out, " clat percentiles (usec):\n |"); + log_buf(out, " %s percentiles (usec):\n |", pre); } else { scale_down = 0; divisor = 1; - log_buf(out, " clat percentiles (nsec):\n |"); + log_buf(out, " %s percentiles (nsec):\n |", pre); } @@ -242,7 +241,7 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, log_buf(out, " |"); /* end of the list */ - is_last = (j == len - 1); + is_last = (j == len - 1) != 0; for (i = 0; i < scale_down; i++) ovals[j] = (ovals[j] + 999) / 1000; @@ -296,14 +295,14 @@ void show_group_stats(struct group_run_stats *rs, struct buf_output *out) if (!rs->max_run[i]) continue; - io = num2str(rs->iobytes[i], 4, 1, i2p, N2S_BYTE); - ioalt = num2str(rs->iobytes[i], 4, 1, !i2p, N2S_BYTE); - agg = num2str(rs->agg[i], 4, 1, i2p, rs->unit_base); - aggalt = num2str(rs->agg[i], 4, 1, !i2p, rs->unit_base); - min = num2str(rs->min_bw[i], 4, 1, i2p, rs->unit_base); - minalt = num2str(rs->min_bw[i], 4, 1, !i2p, rs->unit_base); - max = num2str(rs->max_bw[i], 4, 1, i2p, rs->unit_base); - maxalt = num2str(rs->max_bw[i], 4, 1, !i2p, rs->unit_base); + io = num2str(rs->iobytes[i], rs->sig_figs, 1, i2p, N2S_BYTE); + ioalt = num2str(rs->iobytes[i], rs->sig_figs, 1, !i2p, N2S_BYTE); + agg = num2str(rs->agg[i], rs->sig_figs, 1, i2p, rs->unit_base); + aggalt = num2str(rs->agg[i], rs->sig_figs, 1, !i2p, rs->unit_base); + min = num2str(rs->min_bw[i], rs->sig_figs, 1, i2p, rs->unit_base); + minalt = num2str(rs->min_bw[i], rs->sig_figs, 1, !i2p, rs->unit_base); + max = num2str(rs->max_bw[i], rs->sig_figs, 1, i2p, rs->unit_base); + maxalt = num2str(rs->max_bw[i], rs->sig_figs, 1, !i2p, rs->unit_base); log_buf(out, "%s: bw=%s (%s), %s-%s (%s-%s), io=%s (%s), run=%llu-%llumsec\n", rs->unified_rw_rep ? " MIXED" : str[i], agg, aggalt, min, max, minalt, maxalt, io, ioalt, @@ -321,7 +320,7 @@ void show_group_stats(struct group_run_stats *rs, struct buf_output *out) } } -void stat_calc_dist(unsigned int *map, unsigned long total, double *io_u_dist) +void stat_calc_dist(uint64_t *map, unsigned long total, double *io_u_dist) { int i; @@ -340,7 +339,7 @@ void stat_calc_dist(unsigned int *map, unsigned long total, double *io_u_dist) } static void stat_calc_lat(struct thread_stat *ts, double *dst, - unsigned int *src, int nr) + uint64_t *src, int nr) { unsigned long total = ddir_rw_sum(ts->total_io_u); int i; @@ -363,7 +362,7 @@ static void stat_calc_lat(struct thread_stat *ts, double *dst, * To keep the terse format unaltered, add all of the ns latency * buckets to the first us latency bucket */ -void stat_calc_lat_nu(struct thread_stat *ts, double *io_u_lat_u) +static void stat_calc_lat_nu(struct thread_stat *ts, double *io_u_lat_u) { unsigned long ntotal = 0, total = ddir_rw_sum(ts->total_io_u); int i; @@ -416,13 +415,26 @@ static void display_lat(const char *name, unsigned long long min, static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, int ddir, struct buf_output *out) { - const char *str[] = { " read", "write", " trim" }; + const char *str[] = { " read", "write", " trim", "sync" }; unsigned long runt; unsigned long long min, max, bw, iops; double mean, dev; char *io_p, *bw_p, *bw_p_alt, *iops_p; int i2p; + if (ddir_sync(ddir)) { + if (calc_lat(&ts->sync_stat, &min, &max, &mean, &dev)) { + log_buf(out, " %s:\n", "fsync/fdatasync/sync_file_range"); + display_lat(str[ddir], min, max, mean, dev, out); + show_clat_percentiles(ts->io_u_sync_plat, + ts->sync_stat.samples, + ts->percentile_list, + ts->percentile_precision, + str[ddir], out); + } + return; + } + assert(ddir_rw(ddir)); if (!ts->runtime[ddir]) @@ -432,12 +444,12 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, runt = ts->runtime[ddir]; bw = (1000 * ts->io_bytes[ddir]) / runt; - io_p = num2str(ts->io_bytes[ddir], 4, 1, i2p, N2S_BYTE); - bw_p = num2str(bw, 4, 1, i2p, ts->unit_base); - bw_p_alt = num2str(bw, 4, 1, !i2p, ts->unit_base); + io_p = num2str(ts->io_bytes[ddir], ts->sig_figs, 1, i2p, N2S_BYTE); + bw_p = num2str(bw, ts->sig_figs, 1, i2p, ts->unit_base); + bw_p_alt = num2str(bw, ts->sig_figs, 1, !i2p, ts->unit_base); iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt; - iops_p = num2str(iops, 4, 1, 0, N2S_NONE); + iops_p = num2str(iops, ts->sig_figs, 1, 0, N2S_NONE); log_buf(out, " %s: IOPS=%s, BW=%s (%s)(%s/%llumsec)\n", rs->unified_rw_rep ? "mixed" : str[ddir], @@ -456,11 +468,19 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev)) display_lat(" lat", min, max, mean, dev, out); - if (ts->clat_percentiles) { + if (ts->clat_percentiles || ts->lat_percentiles) { + const char *name = ts->clat_percentiles ? "clat" : " lat"; + 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, out); + ts->percentile_precision, name, out); } if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { double p_of_agg = 100.0, fkb_base = (double)rs->kb_base; @@ -475,6 +495,12 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, else bw_str = "kB"; + if (rs->agg[ddir]) { + p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024); + if (p_of_agg > 100.0) + p_of_agg = 100.0; + } + if (rs->unit_base == 1) { min *= 8.0; max *= 8.0; @@ -482,12 +508,6 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, dev *= 8.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 > fkb_base * fkb_base) { min /= fkb_base; max /= fkb_base; @@ -497,31 +517,32 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts, } log_buf(out, " bw (%5s/s): min=%5llu, max=%5llu, per=%3.2f%%, " - "avg=%5.02f, stdev=%5.02f, samples=%5lu\n", + "avg=%5.02f, stdev=%5.02f, samples=%" PRIu64 "\n", bw_str, min, max, p_of_agg, mean, dev, (&ts->bw_stat[ddir])->samples); } if (calc_lat(&ts->iops_stat[ddir], &min, &max, &mean, &dev)) { - log_buf(out, " iops : min=%5llu, max=%5llu, avg=%5.02f, " - "stdev=%5.02f, samples=%5lu\n", + log_buf(out, " iops : min=%5llu, max=%5llu, " + "avg=%5.02f, stdev=%5.02f, samples=%" PRIu64 "\n", min, max, mean, dev, (&ts->iops_stat[ddir])->samples); } } -static int show_lat(double *io_u_lat, int nr, const char **ranges, - const char *msg, struct buf_output *out) +static bool show_lat(double *io_u_lat, int nr, const char **ranges, + const char *msg, struct buf_output *out) { - int new_line = 1, i, line = 0, shown = 0; + bool new_line = true, shown = false; + int i, line = 0; for (i = 0; i < nr; i++) { if (io_u_lat[i] <= 0.0) continue; - shown = 1; + shown = true; if (new_line) { if (line) log_buf(out, "\n"); - log_buf(out, " lat (%s) : ", msg); - new_line = 0; + log_buf(out, " lat (%s) : ", msg); + new_line = false; line = 0; } if (line) @@ -529,13 +550,13 @@ static int show_lat(double *io_u_lat, int nr, const char **ranges, log_buf(out, "%s%3.2f%%", ranges[i], io_u_lat[i]); line++; if (line == 5) - new_line = 1; + new_line = true; } if (shown) log_buf(out, "\n"); - return shown; + return true; } static void show_lat_n(double *io_u_lat_n, struct buf_output *out) @@ -649,7 +670,6 @@ static int calc_block_percentiles(int nr_block_infos, uint32_t *block_infos, if (len > 1) qsort((void *)plist, len, sizeof(plist[0]), double_cmp); - nr_uninit = 0; /* Start only after the uninit entries end */ for (nr_uninit = 0; nr_uninit < nr_block_infos @@ -733,17 +753,17 @@ static void show_ss_normal(struct thread_stat *ts, struct buf_output *out) bw_mean = steadystate_bw_mean(ts); iops_mean = steadystate_iops_mean(ts); - p1 = num2str(bw_mean / ts->kb_base, 4, ts->kb_base, i2p, ts->unit_base); - p1alt = num2str(bw_mean / ts->kb_base, 4, ts->kb_base, !i2p, ts->unit_base); - p2 = num2str(iops_mean, 4, 1, 0, N2S_NONE); + p1 = num2str(bw_mean / ts->kb_base, ts->sig_figs, ts->kb_base, i2p, ts->unit_base); + p1alt = num2str(bw_mean / ts->kb_base, ts->sig_figs, ts->kb_base, !i2p, ts->unit_base); + p2 = num2str(iops_mean, ts->sig_figs, 1, 0, N2S_NONE); log_buf(out, " steadystate : attained=%s, bw=%s (%s), iops=%s, %s%s=%.3f%s\n", - ts->ss_state & __FIO_SS_ATTAINED ? "yes" : "no", + ts->ss_state & FIO_SS_ATTAINED ? "yes" : "no", p1, p1alt, p2, - ts->ss_state & __FIO_SS_IOPS ? "iops" : "bw", - ts->ss_state & __FIO_SS_SLOPE ? " slope": " mean dev", + ts->ss_state & FIO_SS_IOPS ? "iops" : "bw", + ts->ss_state & FIO_SS_SLOPE ? " slope": " mean dev", ts->ss_criterion.u.f, - ts->ss_state & __FIO_SS_PCT ? "%" : ""); + ts->ss_state & FIO_SS_PCT ? "%" : ""); free(p1); free(p1alt); @@ -791,6 +811,9 @@ static void show_thread_status_normal(struct thread_stat *ts, show_latencies(ts, out); + if (ts->sync_stat.samples) + show_ddir_status(rs, ts, DDIR_SYNC, out); + runtime = ts->total_run_time; if (runtime) { double runt = (double) runtime; @@ -827,12 +850,13 @@ static void show_thread_status_normal(struct thread_stat *ts, io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]); - log_buf(out, " issued rwt: total=%llu,%llu,%llu," - " short=%llu,%llu,%llu," - " dropped=%llu,%llu,%llu\n", + log_buf(out, " issued rwts: total=%llu,%llu,%llu,%llu" + " short=%llu,%llu,%llu,0" + " dropped=%llu,%llu,%llu,0\n", (unsigned long long) ts->total_io_u[0], (unsigned long long) ts->total_io_u[1], (unsigned long long) ts->total_io_u[2], + (unsigned long long) ts->total_io_u[3], (unsigned long long) ts->short_io_u[0], (unsigned long long) ts->short_io_u[1], (unsigned long long) ts->short_io_u[2], @@ -863,13 +887,13 @@ static void show_thread_status_normal(struct thread_stat *ts, static void show_ddir_status_terse(struct thread_stat *ts, struct group_run_stats *rs, int ddir, - struct buf_output *out) + int ver, struct buf_output *out) { unsigned long long min, max, minv, maxv, bw, iops; unsigned long long *ovals = NULL; double mean, dev; unsigned int len; - int i; + int i, bw_stat; assert(ddir_rw(ddir)); @@ -895,7 +919,7 @@ static void show_ddir_status_terse(struct thread_stat *ts, else log_buf(out, ";%llu;%llu;%f;%f", 0ULL, 0ULL, 0.0, 0.0); - if (ts->clat_percentiles) { + if (ts->clat_percentiles || ts->lat_percentiles) { len = calc_clat_percentiles(ts->io_u_plat[ddir], ts->clat_stat[ddir].samples, ts->percentile_list, &ovals, &maxv, @@ -919,11 +943,12 @@ static void show_ddir_status_terse(struct thread_stat *ts, if (ovals) free(ovals); - if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { + bw_stat = calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev); + if (bw_stat) { double p_of_agg = 100.0; if (rs->agg[ddir]) { - p_of_agg = mean * 100 / (double) rs->agg[ddir]; + p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024); if (p_of_agg > 100.0) p_of_agg = 100.0; } @@ -931,23 +956,36 @@ static void show_ddir_status_terse(struct thread_stat *ts, log_buf(out, ";%llu;%llu;%f%%;%f;%f", min, max, p_of_agg, mean, dev); } else log_buf(out, ";%llu;%llu;%f%%;%f;%f", 0ULL, 0ULL, 0.0, 0.0, 0.0); + + if (ver == 5) { + if (bw_stat) + log_buf(out, ";%" PRIu64, (&ts->bw_stat[ddir])->samples); + else + log_buf(out, ";%lu", 0UL); + + if (calc_lat(&ts->iops_stat[ddir], &min, &max, &mean, &dev)) + log_buf(out, ";%llu;%llu;%f;%f;%" PRIu64, min, max, + mean, dev, (&ts->iops_stat[ddir])->samples); + else + log_buf(out, ";%llu;%llu;%f;%f;%lu", 0ULL, 0ULL, 0.0, 0.0, 0UL); + } } static void add_ddir_status_json(struct thread_stat *ts, struct group_run_stats *rs, int ddir, struct json_object *parent) { unsigned long long min, max, minv, maxv; - unsigned long long bw; + unsigned long long bw_bytes, bw; unsigned long long *ovals = NULL; double mean, dev, iops; unsigned int len; int i; - const char *ddirname[] = {"read", "write", "trim"}; - struct json_object *dir_object, *tmp_object, *percentile_object, *clat_bins_object; + const char *ddirname[] = { "read", "write", "trim", "sync" }; + struct json_object *dir_object, *tmp_object, *percentile_object, *clat_bins_object = NULL; char buf[120]; double p_of_agg = 100.0; - assert(ddir_rw(ddir)); + assert(ddir_rw(ddir) || ddir_sync(ddir)); if (ts->unified_rw_rep && ddir != DDIR_READ) return; @@ -956,76 +994,112 @@ static void add_ddir_status_json(struct thread_stat *ts, json_object_add_value_object(parent, ts->unified_rw_rep ? "mixed" : ddirname[ddir], dir_object); - bw = 0; - iops = 0.0; - if (ts->runtime[ddir]) { - uint64_t runt = ts->runtime[ddir]; - - bw = ((1000 * ts->io_bytes[ddir]) / runt) / 1024; /* KiB/s */ - iops = (1000.0 * (uint64_t) ts->total_io_u[ddir]) / runt; - } + if (ddir_rw(ddir)) { + bw_bytes = 0; + bw = 0; + iops = 0.0; + if (ts->runtime[ddir]) { + uint64_t runt = ts->runtime[ddir]; - json_object_add_value_int(dir_object, "io_bytes", ts->io_bytes[ddir]); - json_object_add_value_int(dir_object, "io_kbytes", ts->io_bytes[ddir] >> 10); - json_object_add_value_int(dir_object, "bw", bw); - json_object_add_value_float(dir_object, "iops", iops); - json_object_add_value_int(dir_object, "runtime", ts->runtime[ddir]); - json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[ddir]); - json_object_add_value_int(dir_object, "short_ios", ts->short_io_u[ddir]); - json_object_add_value_int(dir_object, "drop_ios", ts->drop_io_u[ddir]); + bw_bytes = ((1000 * ts->io_bytes[ddir]) / runt); /* Bytes/s */ + bw = bw_bytes / 1024; /* KiB/s */ + iops = (1000.0 * (uint64_t) ts->total_io_u[ddir]) / runt; + } - if (!calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) { - min = max = 0; - mean = dev = 0.0; - } - tmp_object = json_create_object(); - json_object_add_value_object(dir_object, "slat_ns", tmp_object); - json_object_add_value_int(tmp_object, "min", min); - json_object_add_value_int(tmp_object, "max", max); - json_object_add_value_float(tmp_object, "mean", mean); - json_object_add_value_float(tmp_object, "stddev", dev); + json_object_add_value_int(dir_object, "io_bytes", ts->io_bytes[ddir]); + json_object_add_value_int(dir_object, "io_kbytes", ts->io_bytes[ddir] >> 10); + json_object_add_value_int(dir_object, "bw_bytes", bw_bytes); + json_object_add_value_int(dir_object, "bw", bw); + json_object_add_value_float(dir_object, "iops", iops); + json_object_add_value_int(dir_object, "runtime", ts->runtime[ddir]); + json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[ddir]); + json_object_add_value_int(dir_object, "short_ios", ts->short_io_u[ddir]); + json_object_add_value_int(dir_object, "drop_ios", ts->drop_io_u[ddir]); + + if (!calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) { + min = max = 0; + mean = dev = 0.0; + } + tmp_object = json_create_object(); + json_object_add_value_object(dir_object, "slat_ns", tmp_object); + json_object_add_value_int(tmp_object, "min", min); + json_object_add_value_int(tmp_object, "max", max); + json_object_add_value_float(tmp_object, "mean", mean); + json_object_add_value_float(tmp_object, "stddev", dev); + + if (!calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) { + min = max = 0; + mean = dev = 0.0; + } + tmp_object = json_create_object(); + json_object_add_value_object(dir_object, "clat_ns", tmp_object); + json_object_add_value_int(tmp_object, "min", min); + json_object_add_value_int(tmp_object, "max", max); + json_object_add_value_float(tmp_object, "mean", mean); + json_object_add_value_float(tmp_object, "stddev", dev); + } else { + if (!calc_lat(&ts->sync_stat, &min, &max, &mean, &dev)) { + min = max = 0; + mean = dev = 0.0; + } - if (!calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) { - min = max = 0; - mean = dev = 0.0; + tmp_object = json_create_object(); + json_object_add_value_object(dir_object, "lat_ns", tmp_object); + json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[DDIR_SYNC]); + json_object_add_value_int(tmp_object, "min", min); + json_object_add_value_int(tmp_object, "max", max); + json_object_add_value_float(tmp_object, "mean", mean); + json_object_add_value_float(tmp_object, "stddev", dev); } - tmp_object = json_create_object(); - json_object_add_value_object(dir_object, "clat_ns", tmp_object); - json_object_add_value_int(tmp_object, "min", min); - json_object_add_value_int(tmp_object, "max", max); - json_object_add_value_float(tmp_object, "mean", mean); - json_object_add_value_float(tmp_object, "stddev", dev); - if (ts->clat_percentiles) { - len = calc_clat_percentiles(ts->io_u_plat[ddir], + if (ts->clat_percentiles || ts->lat_percentiles) { + if (ddir_rw(ddir)) { + len = calc_clat_percentiles(ts->io_u_plat[ddir], ts->clat_stat[ddir].samples, ts->percentile_list, &ovals, &maxv, &minv); + } else { + len = calc_clat_percentiles(ts->io_u_sync_plat, + ts->sync_stat.samples, + ts->percentile_list, &ovals, &maxv, + &minv); + } + + if (len > FIO_IO_U_LIST_MAX_LEN) + len = FIO_IO_U_LIST_MAX_LEN; } else len = 0; percentile_object = json_create_object(); json_object_add_value_object(tmp_object, "percentile", percentile_object); - for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) { - if (i >= len) { - json_object_add_value_int(percentile_object, "0.00", 0); - continue; - } + for (i = 0; i < len; i++) { snprintf(buf, sizeof(buf), "%f", ts->percentile_list[i].u.f); json_object_add_value_int(percentile_object, (const char *)buf, ovals[i]); } if (output_format & FIO_OUTPUT_JSON_PLUS) { clat_bins_object = json_create_object(); - json_object_add_value_object(tmp_object, "bins", clat_bins_object); + if (ts->clat_percentiles) + json_object_add_value_object(tmp_object, "bins", clat_bins_object); + for(i = 0; i < FIO_IO_U_PLAT_NR; i++) { - if (ts->io_u_plat[ddir][i]) { - snprintf(buf, sizeof(buf), "%llu", plat_idx_to_val(i)); - json_object_add_value_int(clat_bins_object, (const char *)buf, ts->io_u_plat[ddir][i]); + if (ddir_rw(ddir)) { + if (ts->io_u_plat[ddir][i]) { + snprintf(buf, sizeof(buf), "%llu", plat_idx_to_val(i)); + json_object_add_value_int(clat_bins_object, (const char *)buf, ts->io_u_plat[ddir][i]); + } + } else { + if (ts->io_u_sync_plat[i]) { + snprintf(buf, sizeof(buf), "%llu", plat_idx_to_val(i)); + json_object_add_value_int(clat_bins_object, (const char *)buf, ts->io_u_sync_plat[i]); + } } } } + if (!ddir_rw(ddir)) + return; + if (!calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev)) { min = max = 0; mean = dev = 0.0; @@ -1036,12 +1110,15 @@ static void add_ddir_status_json(struct thread_stat *ts, json_object_add_value_int(tmp_object, "max", max); json_object_add_value_float(tmp_object, "mean", mean); json_object_add_value_float(tmp_object, "stddev", dev); + if (output_format & FIO_OUTPUT_JSON_PLUS && ts->lat_percentiles) + json_object_add_value_object(tmp_object, "bins", clat_bins_object); + if (ovals) free(ovals); if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) { if (rs->agg[ddir]) { - p_of_agg = mean * 100 / (double) rs->agg[ddir]; + p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024); if (p_of_agg > 100.0) p_of_agg = 100.0; } @@ -1087,12 +1164,12 @@ static void show_thread_status_terse_all(struct thread_stat *ts, ts->name, ts->groupid, ts->error); /* Log Read Status */ - show_ddir_status_terse(ts, rs, DDIR_READ, out); + show_ddir_status_terse(ts, rs, DDIR_READ, ver, out); /* Log Write Status */ - show_ddir_status_terse(ts, rs, DDIR_WRITE, out); + show_ddir_status_terse(ts, rs, DDIR_WRITE, ver, out); /* Log Trim Status */ - if (ver == 2 || ver == 4) - show_ddir_status_terse(ts, rs, DDIR_TRIM, out); + if (ver == 2 || ver == 4 || ver == 5) + show_ddir_status_terse(ts, rs, DDIR_TRIM, ver, out); /* CPU Usage */ if (ts->total_run_time) { @@ -1145,7 +1222,7 @@ static void show_thread_status_terse_all(struct thread_stat *ts, } static void json_add_job_opts(struct json_object *root, const char *name, - struct flist_head *opt_list, bool num_jobs) + struct flist_head *opt_list) { struct json_object *dir_object; struct flist_head *entry; @@ -1161,8 +1238,6 @@ static void json_add_job_opts(struct json_object *root, const char *name, const char *pos = ""; p = flist_entry(entry, struct print_option, list); - if (!num_jobs && !strcmp(p->name, "numjobs")) - continue; if (p->value) pos = p->value; json_object_add_value_string(dir_object, p->name, pos); @@ -1196,11 +1271,12 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts, } if (opt_list) - json_add_job_opts(root, "job options", opt_list, true); + json_add_job_opts(root, "job options", opt_list); add_ddir_status_json(ts, rs, DDIR_READ, root); add_ddir_status_json(ts, rs, DDIR_WRITE, root); add_ddir_status_json(ts, rs, DDIR_TRIM, root); + add_ddir_status_json(ts, rs, DDIR_SYNC, root); /* CPU Usage */ if (ts->total_run_time) { @@ -1326,19 +1402,19 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts, char ss_buf[64]; snprintf(ss_buf, sizeof(ss_buf), "%s%s:%f%s", - ts->ss_state & __FIO_SS_IOPS ? "iops" : "bw", - ts->ss_state & __FIO_SS_SLOPE ? "_slope" : "", + ts->ss_state & FIO_SS_IOPS ? "iops" : "bw", + ts->ss_state & FIO_SS_SLOPE ? "_slope" : "", (float) ts->ss_limit.u.f, - ts->ss_state & __FIO_SS_PCT ? "%" : ""); + ts->ss_state & FIO_SS_PCT ? "%" : ""); tmp = json_create_object(); json_object_add_value_object(root, "steadystate", tmp); json_object_add_value_string(tmp, "ss", ss_buf); json_object_add_value_int(tmp, "duration", (int)ts->ss_dur); - json_object_add_value_int(tmp, "attained", (ts->ss_state & __FIO_SS_ATTAINED) > 0); + json_object_add_value_int(tmp, "attained", (ts->ss_state & FIO_SS_ATTAINED) > 0); snprintf(ss_buf, sizeof(ss_buf), "%f%s", (float) ts->ss_criterion.u.f, - ts->ss_state & __FIO_SS_PCT ? "%" : ""); + ts->ss_state & FIO_SS_PCT ? "%" : ""); json_object_add_value_string(tmp, "criterion", ss_buf); json_object_add_value_float(tmp, "max_deviation", ts->ss_deviation.u.f); json_object_add_value_float(tmp, "slope", ts->ss_slope.u.f); @@ -1354,7 +1430,7 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts, ** otherwise it actually points to the second element ** in the list */ - if ((ts->ss_state & __FIO_SS_ATTAINED) || !(ts->ss_state & __FIO_SS_BUFFER_FULL)) + if ((ts->ss_state & FIO_SS_ATTAINED) || !(ts->ss_state & FIO_SS_BUFFER_FULL)) j = ts->ss_head; else j = ts->ss_head == 0 ? ts->ss_dur - 1 : ts->ss_head - 1; @@ -1376,7 +1452,7 @@ static void show_thread_status_terse(struct thread_stat *ts, struct group_run_stats *rs, struct buf_output *out) { - if (terse_version >= 2 && terse_version <= 4) + if (terse_version >= 2 && terse_version <= 5) show_thread_status_terse_all(ts, rs, terse_version, out); else log_err("fio: bad terse version!? %d\n", terse_version); @@ -1456,6 +1532,8 @@ void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src) dst->kb_base = src->kb_base; if (!dst->unit_base) dst->unit_base = src->unit_base; + if (!dst->sig_figs) + dst->sig_figs = src->sig_figs; } void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, @@ -1495,24 +1573,25 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, } } + sum_stat(&dst->sync_stat, &src->sync_stat, first); dst->usr_time += src->usr_time; dst->sys_time += src->sys_time; dst->ctx += src->ctx; dst->majf += src->majf; dst->minf += src->minf; - for (k = 0; k < FIO_IO_U_MAP_NR; k++) + for (k = 0; k < FIO_IO_U_MAP_NR; k++) { dst->io_u_map[k] += src->io_u_map[k]; - for (k = 0; k < FIO_IO_U_MAP_NR; k++) dst->io_u_submit[k] += src->io_u_submit[k]; - for (k = 0; k < FIO_IO_U_MAP_NR; k++) dst->io_u_complete[k] += src->io_u_complete[k]; - for (k = 0; k < FIO_IO_U_LAT_N_NR; k++) + } + for (k = 0; k < FIO_IO_U_LAT_N_NR; k++) { dst->io_u_lat_n[k] += src->io_u_lat_n[k]; - for (k = 0; k < FIO_IO_U_LAT_U_NR; k++) dst->io_u_lat_u[k] += src->io_u_lat_u[k]; - for (k = 0; k < FIO_IO_U_LAT_M_NR; k++) dst->io_u_lat_m[k] += src->io_u_lat_m[k]; + } + for (k = 0; k < FIO_IO_U_PLAT_NR; k++) + dst->io_u_sync_plat[k] += src->io_u_sync_plat[k]; for (k = 0; k < DDIR_RWDIR_CNT; k++) { if (!dst->unified_rw_rep) { @@ -1526,6 +1605,8 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, } } + dst->total_io_u[DDIR_SYNC] += src->total_io_u[DDIR_SYNC]; + for (k = 0; k < DDIR_RWDIR_CNT; k++) { int m; @@ -1564,6 +1645,7 @@ void init_thread_stat(struct thread_stat *ts) ts->bw_stat[j].min_val = -1UL; ts->iops_stat[j].min_val = -1UL; } + ts->sync_stat.min_val = -1UL; ts->groupid = -1; } @@ -1573,8 +1655,8 @@ void __show_run_stats(void) struct thread_data *td; struct thread_stat *threadstats, *ts; int i, j, k, nr_ts, last_ts, idx; - int kb_base_warned = 0; - int unit_base_warned = 0; + bool kb_base_warned = false; + bool unit_base_warned = false; struct json_object *root = NULL; struct json_array *array = NULL; struct buf_output output[FIO_OUTPUT_NR]; @@ -1630,6 +1712,7 @@ void __show_run_stats(void) ts = &threadstats[j]; ts->clat_percentiles = td->o.clat_percentiles; + ts->lat_percentiles = td->o.lat_percentiles; ts->percentile_precision = td->o.percentile_precision; memcpy(ts->percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list)); opt_lists[j] = &td->opt_list; @@ -1662,15 +1745,16 @@ void __show_run_stats(void) ts->kb_base = td->o.kb_base; ts->unit_base = td->o.unit_base; + ts->sig_figs = td->o.sig_figs; ts->unified_rw_rep = td->o.unified_rw_rep; } else if (ts->kb_base != td->o.kb_base && !kb_base_warned) { log_info("fio: kb_base differs for jobs in group, using" " %u as the base\n", ts->kb_base); - kb_base_warned = 1; + kb_base_warned = true; } else if (ts->unit_base != td->o.unit_base && !unit_base_warned) { log_info("fio: unit_base differs for jobs in group, using" " %u as the base\n", ts->unit_base); - unit_base_warned = 1; + unit_base_warned = true; } ts->continue_on_error = td->o.continue_on_error; @@ -1724,6 +1808,7 @@ void __show_run_stats(void) rs = &runstats[ts->groupid]; rs->kb_base = ts->kb_base; rs->unit_base = ts->unit_base; + rs->sig_figs = ts->sig_figs; rs->unified_rw_rep += ts->unified_rw_rep; for (j = 0; j < DDIR_RWDIR_CNT; j++) { @@ -1771,13 +1856,14 @@ void __show_run_stats(void) char time_buf[32]; struct timeval now; unsigned long long ms_since_epoch; + time_t tv_sec; gettimeofday(&now, NULL); ms_since_epoch = (unsigned long long)(now.tv_sec) * 1000 + (unsigned long long)(now.tv_usec) / 1000; - os_ctime_r((const time_t *) &now.tv_sec, time_buf, - sizeof(time_buf)); + tv_sec = now.tv_sec; + os_ctime_r(&tv_sec, time_buf, sizeof(time_buf)); if (time_buf[strlen(time_buf) - 1] == '\n') time_buf[strlen(time_buf) - 1] = '\0'; @@ -1787,7 +1873,7 @@ void __show_run_stats(void) json_object_add_value_int(root, "timestamp_ms", ms_since_epoch); json_object_add_value_string(root, "time", time_buf); global = get_global_options(); - json_add_job_opts(root, "global options", &global->opt_list, false); + json_add_job_opts(root, "global options", &global->opt_list); array = json_create_array(); json_object_add_value_array(root, "jobs", array); } @@ -1854,13 +1940,6 @@ void __show_run_stats(void) free(opt_lists); } -void show_run_stats(void) -{ - fio_mutex_down(stat_mutex); - __show_run_stats(); - fio_mutex_up(stat_mutex); -} - void __show_running_run_stats(void) { struct thread_data *td; @@ -1868,7 +1947,7 @@ void __show_running_run_stats(void) struct timespec ts; int i; - fio_mutex_down(stat_mutex); + fio_sem_down(stat_sem); rt = malloc(thread_number * sizeof(unsigned long long)); fio_gettime(&ts, NULL); @@ -1894,7 +1973,7 @@ void __show_running_run_stats(void) continue; if (td->rusage_sem) { td->update_rusage = 1; - fio_mutex_down(td->rusage_sem); + fio_sem_down(td->rusage_sem); } td->update_rusage = 0; } @@ -1911,12 +1990,12 @@ void __show_running_run_stats(void) } free(rt); - fio_mutex_up(stat_mutex); + fio_sem_up(stat_sem); } -static int status_interval_init; +static bool status_interval_init; static struct timespec status_time; -static int status_file_disabled; +static bool status_file_disabled; #define FIO_STATUS_FILE "fio-dump-status" @@ -1947,7 +2026,7 @@ static int check_status_file(void) log_err("fio: failed to unlink %s: %s\n", fio_status_file_path, strerror(errno)); log_err("fio: disabling status file updates\n"); - status_file_disabled = 1; + status_file_disabled = true; } return 1; @@ -1958,7 +2037,7 @@ void check_for_running_stats(void) if (status_interval) { if (!status_interval_init) { fio_gettime(&status_time, NULL); - status_interval_init = 1; + status_interval_init = true; } else if (mtime_since_now(&status_time) >= status_interval) { show_running_run_stats(); fio_gettime(&status_time, NULL); @@ -2144,7 +2223,7 @@ static void __add_log_sample(struct io_log *iolog, union io_sample_data data, if (iolog->disabled) return; if (flist_empty(&iolog->io_logs)) - iolog->avg_last = t; + iolog->avg_last[ddir] = t; cur_log = get_cur_log(iolog); if (cur_log) { @@ -2194,10 +2273,15 @@ void reset_io_stats(struct thread_data *td) ts->short_io_u[i] = 0; ts->drop_io_u[i] = 0; - for (j = 0; j < FIO_IO_U_PLAT_NR; j++) + for (j = 0; j < FIO_IO_U_PLAT_NR; j++) { ts->io_u_plat[i][j] = 0; + if (!i) + ts->io_u_sync_plat[j] = 0; + } } + ts->total_io_u[DDIR_SYNC] = 0; + for (i = 0; i < FIO_IO_U_MAP_NR; i++) { ts->io_u_map[i] = 0; ts->io_u_submit[i] = 0; @@ -2246,9 +2330,11 @@ static void _add_stat_to_log(struct io_log *iolog, unsigned long elapsed, __add_stat_to_log(iolog, ddir, elapsed, log_max); } -static long add_log_sample(struct thread_data *td, struct io_log *iolog, - union io_sample_data data, enum fio_ddir ddir, - unsigned int bs, uint64_t offset) +static unsigned long add_log_sample(struct thread_data *td, + struct io_log *iolog, + union io_sample_data data, + enum fio_ddir ddir, unsigned int bs, + uint64_t offset) { unsigned long elapsed, this_window; @@ -2275,19 +2361,19 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog, * If period hasn't passed, adding the above sample is all we * need to do. */ - this_window = elapsed - iolog->avg_last; - if (elapsed < iolog->avg_last) - return iolog->avg_last - elapsed; + this_window = elapsed - iolog->avg_last[ddir]; + if (elapsed < iolog->avg_last[ddir]) + return iolog->avg_last[ddir] - elapsed; else if (this_window < iolog->avg_msec) { - int diff = iolog->avg_msec - this_window; + unsigned long diff = iolog->avg_msec - this_window; if (inline_log(iolog) || diff > LOG_MSEC_SLACK) return diff; } - _add_stat_to_log(iolog, elapsed, td->o.log_max != 0); + __add_stat_to_log(iolog, ddir, elapsed, td->o.log_max != 0); - iolog->avg_last = elapsed - (this_window - iolog->avg_msec); + iolog->avg_last[ddir] = elapsed - (this_window - iolog->avg_msec); return iolog->avg_msec; } @@ -2320,6 +2406,15 @@ void add_agg_sample(union io_sample_data data, enum fio_ddir ddir, unsigned int __add_log_sample(iolog, data, ddir, bs, mtime_since_genesis(), 0); } +void add_sync_clat_sample(struct thread_stat *ts, unsigned long long nsec) +{ + unsigned int idx = plat_val_to_idx(nsec); + assert(idx < FIO_IO_U_PLAT_NR); + + ts->io_u_sync_plat[idx]++; + add_stat_sample(&ts->sync_stat, nsec); +} + static void add_clat_percentile_sample(struct thread_stat *ts, unsigned long long nsec, enum fio_ddir ddir) { @@ -2357,7 +2452,7 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir, this_window = elapsed - hw->hist_last; if (this_window >= iolog->hist_msec) { - unsigned int *io_u_plat; + uint64_t *io_u_plat; struct io_u_plat_entry *dst; /* @@ -2367,7 +2462,7 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir, * located in iolog.c after printing this sample to the * log file. */ - io_u_plat = (unsigned int *) td->ts.io_u_plat[ddir]; + io_u_plat = (uint64_t *) td->ts.io_u_plat[ddir]; dst = malloc(sizeof(struct io_u_plat_entry)); memcpy(&(dst->io_u_plat), io_u_plat, FIO_IO_U_PLAT_NR * sizeof(unsigned int)); @@ -2422,6 +2517,9 @@ void add_lat_sample(struct thread_data *td, enum fio_ddir ddir, add_log_sample(td, td->lat_log, sample_val(nsec), ddir, bs, offset); + if (ts->lat_percentiles) + add_clat_percentile_sample(ts, nsec, ddir); + td_io_u_unlock(td); } @@ -2456,7 +2554,7 @@ static int __add_samples(struct thread_data *td, struct timespec *parent_tv, { unsigned long spent, rate; enum fio_ddir ddir; - unsigned int next, next_log; + unsigned long next, next_log; next_log = avg_time; @@ -2581,7 +2679,7 @@ int calc_log_samples(void) void stat_init(void) { - stat_mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED); + stat_sem = fio_sem_init(FIO_SEM_UNLOCKED); } void stat_exit(void) @@ -2590,8 +2688,8 @@ void stat_exit(void) * When we have the mutex, we know out-of-band access to it * have ended. */ - fio_mutex_down(stat_mutex); - fio_mutex_remove(stat_mutex); + fio_sem_down(stat_sem); + fio_sem_remove(stat_sem); } /*