#include "json.h"
#include "lib/getrusage.h"
#include "idletime.h"
+#include "lib/pow2.h"
+#include "lib/output_buffer.h"
struct fio_mutex *stat_mutex;
* 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 precision)
+ fio_fp64_t *plist, unsigned int precision,
+ struct buf_output *out)
{
unsigned int len, j = 0, minv, maxv;
unsigned int *ovals;
*/
if (minv > 2000 && maxv > 99999) {
scale_down = 1;
- log_info(" clat percentiles (msec):\n |");
+ log_buf(out, " clat percentiles (msec):\n |");
} else {
scale_down = 0;
- log_info(" clat percentiles (usec):\n |");
+ log_buf(out, " clat percentiles (usec):\n |");
}
snprintf(fmt, sizeof(fmt), "%%1.%uf", precision);
/* for formatting */
if (j != 0 && (j % per_line) == 0)
- log_info(" |");
+ log_buf(out, " |");
/* end of the list */
is_last = (j == len - 1);
if (scale_down)
ovals[j] = (ovals[j] + 999) / 1000;
- log_info(" %sth=[%5u]%c", fbuf, ovals[j], is_last ? '\n' : ',');
+ log_buf(out, " %sth=[%5u]%c", fbuf, ovals[j], is_last ? '\n' : ',');
if (is_last)
break;
if ((j % per_line) == per_line - 1) /* for formatting */
- log_info("\n");
+ log_buf(out, "\n");
}
out:
return 1;
}
-void show_group_stats(struct group_run_stats *rs)
+void show_group_stats(struct group_run_stats *rs, struct buf_output *out)
{
char *p1, *p2, *p3, *p4;
const char *str[] = { " READ", " WRITE" , " TRIM"};
int i;
- log_info("\nRun status group %d (all jobs):\n", rs->groupid);
+ log_buf(out, "\nRun status group %d (all jobs):\n", rs->groupid);
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
const int i2p = is_power_of_2(rs->kb_base);
p3 = num2str(rs->min_bw[i], 6, rs->kb_base, i2p, rs->unit_base);
p4 = num2str(rs->max_bw[i], 6, rs->kb_base, i2p, rs->unit_base);
- log_info("%s: io=%s, aggrb=%s/s, minb=%s/s, maxb=%s/s,"
+ log_buf(out, "%s: io=%s, aggrb=%s/s, minb=%s/s, maxb=%s/s,"
" mint=%llumsec, maxt=%llumsec\n",
rs->unified_rw_rep ? " MIXED" : str[i],
p1, p2, p3, p4,
}
static void display_lat(const char *name, unsigned long min, unsigned long max,
- double mean, double dev)
+ double mean, double dev, struct buf_output *out)
{
const char *base = "(usec)";
char *minp, *maxp;
minp = num2str(min, 6, 1, 0, 0);
maxp = num2str(max, 6, 1, 0, 0);
- log_info(" %s %s: min=%s, max=%s, avg=%5.02f,"
+ log_buf(out, " %s %s: min=%s, max=%s, avg=%5.02f,"
" stdev=%5.02f\n", name, base, minp, maxp, mean, dev);
free(minp);
}
static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
- int ddir)
+ int ddir, struct buf_output *out)
{
const char *str[] = { "read ", "write", "trim" };
unsigned long min, max, runt;
iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt;
iops_p = num2str(iops, 6, 1, 0, 0);
- log_info(" %s: io=%s, bw=%s/s, iops=%s, runt=%6llumsec\n",
+ log_buf(out, " %s: io=%s, bw=%s/s, iops=%s, runt=%6llumsec\n",
rs->unified_rw_rep ? "mixed" : str[ddir],
io_p, bw_p, iops_p,
(unsigned long long) ts->runtime[ddir]);
free(iops_p);
if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
- display_lat("slat", min, max, mean, dev);
+ display_lat("slat", min, max, mean, dev, out);
if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
- display_lat("clat", min, max, mean, dev);
+ display_lat("clat", min, max, mean, dev, out);
if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
- display_lat(" lat", min, max, mean, dev);
+ display_lat(" lat", min, max, mean, dev, out);
if (ts->clat_percentiles) {
show_clat_percentiles(ts->io_u_plat[ddir],
ts->clat_stat[ddir].samples,
ts->percentile_list,
- ts->percentile_precision);
+ ts->percentile_precision, out);
}
if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
double p_of_agg = 100.0, fkb_base = (double)rs->kb_base;
bw_str = (rs->unit_base == 1 ? "Mbit" : "MB");
}
- log_info(" bw (%-4s/s): min=%5lu, max=%5lu, per=%3.2f%%,"
+ log_buf(out, " bw (%-4s/s): min=%5lu, max=%5lu, per=%3.2f%%,"
" avg=%5.02f, stdev=%5.02f\n", bw_str, min, max,
p_of_agg, mean, dev);
}
}
static int show_lat(double *io_u_lat, int nr, const char **ranges,
- const char *msg)
+ const char *msg, struct buf_output *out)
{
int new_line = 1, i, line = 0, shown = 0;
shown = 1;
if (new_line) {
if (line)
- log_info("\n");
- log_info(" lat (%s) : ", msg);
+ log_buf(out, "\n");
+ log_buf(out, " lat (%s) : ", msg);
new_line = 0;
line = 0;
}
if (line)
- log_info(", ");
- log_info("%s%3.2f%%", ranges[i], io_u_lat[i]);
+ log_buf(out, ", ");
+ log_buf(out, "%s%3.2f%%", ranges[i], io_u_lat[i]);
line++;
if (line == 5)
new_line = 1;
}
if (shown)
- log_info("\n");
+ log_buf(out, "\n");
return shown;
}
-static void show_lat_u(double *io_u_lat_u)
+static void show_lat_u(double *io_u_lat_u, struct buf_output *out)
{
const char *ranges[] = { "2=", "4=", "10=", "20=", "50=", "100=",
"250=", "500=", "750=", "1000=", };
- show_lat(io_u_lat_u, FIO_IO_U_LAT_U_NR, ranges, "usec");
+ show_lat(io_u_lat_u, FIO_IO_U_LAT_U_NR, ranges, "usec", out);
}
-static void show_lat_m(double *io_u_lat_m)
+static void show_lat_m(double *io_u_lat_m, struct buf_output *out)
{
const char *ranges[] = { "2=", "4=", "10=", "20=", "50=", "100=",
"250=", "500=", "750=", "1000=", "2000=",
">=2000=", };
- show_lat(io_u_lat_m, FIO_IO_U_LAT_M_NR, ranges, "msec");
+ show_lat(io_u_lat_m, FIO_IO_U_LAT_M_NR, ranges, "msec", out);
}
-static void show_latencies(struct thread_stat *ts)
+static void show_latencies(struct thread_stat *ts, struct buf_output *out)
{
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
double io_u_lat_m[FIO_IO_U_LAT_M_NR];
stat_calc_lat_u(ts, io_u_lat_u);
stat_calc_lat_m(ts, io_u_lat_m);
- show_lat_u(io_u_lat_u);
- show_lat_m(io_u_lat_m);
+ show_lat_u(io_u_lat_u, out);
+ show_lat_m(io_u_lat_m, out);
+}
+
+static int block_state_category(int block_state)
+{
+ switch (block_state) {
+ case BLOCK_STATE_UNINIT:
+ return 0;
+ case BLOCK_STATE_TRIMMED:
+ case BLOCK_STATE_WRITTEN:
+ return 1;
+ case BLOCK_STATE_WRITE_FAILURE:
+ case BLOCK_STATE_TRIM_FAILURE:
+ return 2;
+ default:
+ /* Silence compile warning on some BSDs and have a return */
+ assert(0);
+ return -1;
+ }
+}
+
+static int compare_block_infos(const void *bs1, const void *bs2)
+{
+ uint32_t block1 = *(uint32_t *)bs1;
+ uint32_t block2 = *(uint32_t *)bs2;
+ int state1 = BLOCK_INFO_STATE(block1);
+ int state2 = BLOCK_INFO_STATE(block2);
+ int bscat1 = block_state_category(state1);
+ int bscat2 = block_state_category(state2);
+ int cycles1 = BLOCK_INFO_TRIMS(block1);
+ int cycles2 = BLOCK_INFO_TRIMS(block2);
+
+ if (bscat1 < bscat2)
+ return -1;
+ if (bscat1 > bscat2)
+ return 1;
+
+ if (cycles1 < cycles2)
+ return -1;
+ if (cycles1 > cycles2)
+ return 1;
+
+ if (state1 < state2)
+ return -1;
+ if (state1 > state2)
+ return 1;
+
+ assert(block1 == block2);
+ return 0;
+}
+
+static int calc_block_percentiles(int nr_block_infos, uint32_t *block_infos,
+ fio_fp64_t *plist, unsigned int **percentiles,
+ unsigned int *types)
+{
+ int len = 0;
+ int i, nr_uninit;
+
+ qsort(block_infos, nr_block_infos, sizeof(uint32_t), compare_block_infos);
+
+ 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
+ * isn't a worry. Also note that this does not work for NaN values.
+ */
+ 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
+ && BLOCK_INFO_STATE(block_infos[nr_uninit]) == BLOCK_STATE_UNINIT;
+ nr_uninit ++)
+ ;
+
+ if (nr_uninit == nr_block_infos)
+ return 0;
+
+ *percentiles = calloc(len, sizeof(**percentiles));
+
+ for (i = 0; i < len; i++) {
+ int idx = (plist[i].u.f * (nr_block_infos - nr_uninit) / 100)
+ + nr_uninit;
+ (*percentiles)[i] = BLOCK_INFO_TRIMS(block_infos[idx]);
+ }
+
+ memset(types, 0, sizeof(*types) * BLOCK_STATE_COUNT);
+ for (i = 0; i < nr_block_infos; i++)
+ types[BLOCK_INFO_STATE(block_infos[i])]++;
+
+ return len;
+}
+
+static const char *block_state_names[] = {
+ [BLOCK_STATE_UNINIT] = "unwritten",
+ [BLOCK_STATE_TRIMMED] = "trimmed",
+ [BLOCK_STATE_WRITTEN] = "written",
+ [BLOCK_STATE_TRIM_FAILURE] = "trim failure",
+ [BLOCK_STATE_WRITE_FAILURE] = "write failure",
+};
+
+static void show_block_infos(int nr_block_infos, uint32_t *block_infos,
+ fio_fp64_t *plist, struct buf_output *out)
+{
+ int len, pos, i;
+ unsigned int *percentiles = NULL;
+ unsigned int block_state_counts[BLOCK_STATE_COUNT];
+
+ len = calc_block_percentiles(nr_block_infos, block_infos, plist,
+ &percentiles, block_state_counts);
+
+ log_buf(out, " block lifetime percentiles :\n |");
+ pos = 0;
+ for (i = 0; i < len; i++) {
+ uint32_t block_info = percentiles[i];
+#define LINE_LENGTH 75
+ char str[LINE_LENGTH];
+ int strln = snprintf(str, LINE_LENGTH, " %3.2fth=%u%c",
+ plist[i].u.f, block_info,
+ i == len - 1 ? '\n' : ',');
+ assert(strln < LINE_LENGTH);
+ if (pos + strln > LINE_LENGTH) {
+ pos = 0;
+ log_buf(out, "\n |");
+ }
+ log_buf(out, "%s", str);
+ pos += strln;
+#undef LINE_LENGTH
+ }
+ if (percentiles)
+ free(percentiles);
+
+ log_buf(out, " states :");
+ for (i = 0; i < BLOCK_STATE_COUNT; i++)
+ log_buf(out, " %s=%u%c",
+ block_state_names[i], block_state_counts[i],
+ i == BLOCK_STATE_COUNT - 1 ? '\n' : ',');
}
static void show_thread_status_normal(struct thread_stat *ts,
- struct group_run_stats *rs)
+ struct group_run_stats *rs,
+ struct buf_output *out)
{
double usr_cpu, sys_cpu;
unsigned long runtime;
double io_u_dist[FIO_IO_U_MAP_NR];
time_t time_p;
- char time_buf[64];
+ char time_buf[32];
if (!ddir_rw_sum(ts->io_bytes) && !ddir_rw_sum(ts->total_io_u))
return;
os_ctime_r((const time_t *) &time_p, time_buf, sizeof(time_buf));
if (!ts->error) {
- log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d: %s",
+ log_buf(out, "%s: (groupid=%d, jobs=%d): err=%2d: pid=%d: %s",
ts->name, ts->groupid, ts->members,
ts->error, (int) ts->pid, time_buf);
} else {
- log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d: %s",
+ log_buf(out, "%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d: %s",
ts->name, ts->groupid, ts->members,
ts->error, ts->verror, (int) ts->pid,
time_buf);
}
if (strlen(ts->description))
- log_info(" Description : [%s]\n", ts->description);
+ log_buf(out, " Description : [%s]\n", ts->description);
if (ts->io_bytes[DDIR_READ])
- show_ddir_status(rs, ts, DDIR_READ);
+ show_ddir_status(rs, ts, DDIR_READ, out);
if (ts->io_bytes[DDIR_WRITE])
- show_ddir_status(rs, ts, DDIR_WRITE);
+ show_ddir_status(rs, ts, DDIR_WRITE, out);
if (ts->io_bytes[DDIR_TRIM])
- show_ddir_status(rs, ts, DDIR_TRIM);
+ show_ddir_status(rs, ts, DDIR_TRIM, out);
- show_latencies(ts);
+ show_latencies(ts, out);
runtime = ts->total_run_time;
if (runtime) {
sys_cpu = 0;
}
- log_info(" cpu : usr=%3.2f%%, sys=%3.2f%%, ctx=%llu,"
+ log_buf(out, " cpu : usr=%3.2f%%, sys=%3.2f%%, ctx=%llu,"
" majf=%llu, minf=%llu\n", usr_cpu, sys_cpu,
(unsigned long long) ts->ctx,
(unsigned long long) ts->majf,
(unsigned long long) ts->minf);
stat_calc_dist(ts->io_u_map, ddir_rw_sum(ts->total_io_u), io_u_dist);
- log_info(" IO depths : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%,"
+ log_buf(out, " IO depths : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%,"
" 16=%3.1f%%, 32=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0],
io_u_dist[1], io_u_dist[2],
io_u_dist[3], io_u_dist[4],
io_u_dist[5], io_u_dist[6]);
stat_calc_dist(ts->io_u_submit, ts->total_submit, io_u_dist);
- log_info(" submit : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
+ log_buf(out, " submit : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
" 32=%3.1f%%, 64=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0],
io_u_dist[1], io_u_dist[2],
io_u_dist[3], io_u_dist[4],
io_u_dist[5], io_u_dist[6]);
stat_calc_dist(ts->io_u_complete, ts->total_complete, io_u_dist);
- log_info(" complete : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
+ log_buf(out, " complete : 0=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%,"
" 32=%3.1f%%, 64=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0],
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_info(" issued : total=r=%llu/w=%llu/d=%llu,"
+ log_buf(out, " issued : total=r=%llu/w=%llu/d=%llu,"
" short=r=%llu/w=%llu/d=%llu,"
" drop=r=%llu/w=%llu/d=%llu\n",
(unsigned long long) ts->total_io_u[0],
(unsigned long long) ts->drop_io_u[1],
(unsigned long long) ts->drop_io_u[2]);
if (ts->continue_on_error) {
- log_info(" errors : total=%llu, first_error=%d/<%s>\n",
+ log_buf(out, " errors : total=%llu, first_error=%d/<%s>\n",
(unsigned long long)ts->total_err_count,
ts->first_error,
strerror(ts->first_error));
}
if (ts->latency_depth) {
- log_info(" latency : target=%llu, window=%llu, percentile=%.2f%%, depth=%u\n",
+ log_buf(out, " latency : target=%llu, window=%llu, percentile=%.2f%%, depth=%u\n",
(unsigned long long)ts->latency_target,
(unsigned long long)ts->latency_window,
ts->latency_percentile.u.f,
ts->latency_depth);
}
+
+ if (ts->nr_block_infos)
+ show_block_infos(ts->nr_block_infos, ts->block_infos,
+ ts->percentile_list, out);
}
static void show_ddir_status_terse(struct thread_stat *ts,
- struct group_run_stats *rs, int ddir)
+ struct group_run_stats *rs, int ddir,
+ struct buf_output *out)
{
unsigned long min, max;
unsigned long long bw, iops;
iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt;
}
- log_info(";%llu;%llu;%llu;%llu",
+ log_buf(out, ";%llu;%llu;%llu;%llu",
(unsigned long long) ts->io_bytes[ddir] >> 10, bw, iops,
(unsigned long long) ts->runtime[ddir]);
if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
- log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
+ log_buf(out, ";%lu;%lu;%f;%f", min, max, mean, dev);
else
- log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+ log_buf(out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
- log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
+ log_buf(out, ";%lu;%lu;%f;%f", min, max, mean, dev);
else
- log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+ log_buf(out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
if (ts->clat_percentiles) {
len = calc_clat_percentiles(ts->io_u_plat[ddir],
for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
if (i >= len) {
- log_info(";0%%=0");
+ log_buf(out, ";0%%=0");
continue;
}
- log_info(";%f%%=%u", ts->percentile_list[i].u.f, ovals[i]);
+ log_buf(out, ";%f%%=%u", ts->percentile_list[i].u.f, ovals[i]);
}
if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
- log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
+ log_buf(out, ";%lu;%lu;%f;%f", min, max, mean, dev);
else
- log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+ log_buf(out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
if (ovals)
free(ovals);
p_of_agg = 100.0;
}
- log_info(";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
+ log_buf(out, ";%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);
+ log_buf(out, ";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
}
static void add_ddir_status_json(struct thread_stat *ts,
struct group_run_stats *rs, int ddir, struct json_object *parent)
{
unsigned long min, max;
- unsigned long long bw, iops;
+ unsigned long long bw;
unsigned int *ovals = NULL;
- double mean, dev;
+ double mean, dev, iops;
unsigned int len, minv, maxv;
int i;
const char *ddirname[] = {"read", "write", "trim"};
json_object_add_value_object(parent,
ts->unified_rw_rep ? "mixed" : ddirname[ddir], dir_object);
- iops = bw = 0;
+ bw = 0;
+ iops = 0.0;
if (ts->runtime[ddir]) {
uint64_t runt = ts->runtime[ddir];
bw = ((1000 * ts->io_bytes[ddir]) / runt) / 1024;
- iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt;
+ iops = (1000.0 * (uint64_t) ts->total_io_u[ddir]) / runt;
}
json_object_add_value_int(dir_object, "io_bytes", ts->io_bytes[ddir] >> 10);
json_object_add_value_int(dir_object, "bw", bw);
- json_object_add_value_int(dir_object, "iops", iops);
+ 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]);
}
static void show_thread_status_terse_v2(struct thread_stat *ts,
- struct group_run_stats *rs)
+ struct group_run_stats *rs,
+ struct buf_output *out)
{
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
int i;
/* General Info */
- log_info("2;%s;%d;%d", ts->name, ts->groupid, ts->error);
+ log_buf(out, "2;%s;%d;%d", ts->name, ts->groupid, ts->error);
/* Log Read Status */
- show_ddir_status_terse(ts, rs, DDIR_READ);
+ show_ddir_status_terse(ts, rs, DDIR_READ, out);
/* Log Write Status */
- show_ddir_status_terse(ts, rs, DDIR_WRITE);
+ show_ddir_status_terse(ts, rs, DDIR_WRITE, out);
/* Log Trim Status */
- show_ddir_status_terse(ts, rs, DDIR_TRIM);
+ show_ddir_status_terse(ts, rs, DDIR_TRIM, out);
/* CPU Usage */
if (ts->total_run_time) {
sys_cpu = 0;
}
- log_info(";%f%%;%f%%;%llu;%llu;%llu", usr_cpu, sys_cpu,
+ log_buf(out, ";%f%%;%f%%;%llu;%llu;%llu", usr_cpu, sys_cpu,
(unsigned long long) ts->ctx,
(unsigned long long) ts->majf,
(unsigned long long) ts->minf);
stat_calc_lat_m(ts, io_u_lat_m);
/* Only show fixed 7 I/O depth levels*/
- log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%",
+ log_buf(out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%",
io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3],
io_u_dist[4], io_u_dist[5], io_u_dist[6]);
/* Microsecond latency */
for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
- log_info(";%3.2f%%", io_u_lat_u[i]);
+ log_buf(out, ";%3.2f%%", io_u_lat_u[i]);
/* Millisecond latency */
for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
- log_info(";%3.2f%%", io_u_lat_m[i]);
+ log_buf(out, ";%3.2f%%", io_u_lat_m[i]);
/* Additional output if continue_on_error set - default off*/
if (ts->continue_on_error)
- log_info(";%llu;%d", (unsigned long long) ts->total_err_count, ts->first_error);
- log_info("\n");
+ log_buf(out, ";%llu;%d", (unsigned long long) ts->total_err_count, ts->first_error);
+ log_buf(out, "\n");
/* Additional output if description is set */
if (strlen(ts->description))
- log_info(";%s", ts->description);
+ log_buf(out, ";%s", ts->description);
- log_info("\n");
+ log_buf(out, "\n");
}
static void show_thread_status_terse_v3_v4(struct thread_stat *ts,
- struct group_run_stats *rs, int ver)
+ struct group_run_stats *rs, int ver,
+ struct buf_output *out)
{
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
int i;
/* General Info */
- log_info("%d;%s;%s;%d;%d", ver, fio_version_string,
+ log_buf(out, "%d;%s;%s;%d;%d", ver, fio_version_string,
ts->name, ts->groupid, ts->error);
/* Log Read Status */
- show_ddir_status_terse(ts, rs, DDIR_READ);
+ show_ddir_status_terse(ts, rs, DDIR_READ, out);
/* Log Write Status */
- show_ddir_status_terse(ts, rs, DDIR_WRITE);
+ show_ddir_status_terse(ts, rs, DDIR_WRITE, out);
/* Log Trim Status */
if (ver == 4)
- show_ddir_status_terse(ts, rs, DDIR_TRIM);
+ show_ddir_status_terse(ts, rs, DDIR_TRIM, out);
/* CPU Usage */
if (ts->total_run_time) {
sys_cpu = 0;
}
- log_info(";%f%%;%f%%;%llu;%llu;%llu", usr_cpu, sys_cpu,
+ log_buf(out, ";%f%%;%f%%;%llu;%llu;%llu", usr_cpu, sys_cpu,
(unsigned long long) ts->ctx,
(unsigned long long) ts->majf,
(unsigned long long) ts->minf);
stat_calc_lat_m(ts, io_u_lat_m);
/* Only show fixed 7 I/O depth levels*/
- log_info(";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%",
+ log_buf(out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%",
io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3],
io_u_dist[4], io_u_dist[5], io_u_dist[6]);
/* Microsecond latency */
for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
- log_info(";%3.2f%%", io_u_lat_u[i]);
+ log_buf(out, ";%3.2f%%", io_u_lat_u[i]);
/* Millisecond latency */
for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
- log_info(";%3.2f%%", io_u_lat_m[i]);
+ log_buf(out, ";%3.2f%%", io_u_lat_m[i]);
/* disk util stats, if any */
- show_disk_util(1, NULL);
+ show_disk_util(1, NULL, out);
/* Additional output if continue_on_error set - default off*/
if (ts->continue_on_error)
- log_info(";%llu;%d", (unsigned long long) ts->total_err_count, ts->first_error);
+ log_buf(out, ";%llu;%d", (unsigned long long) ts->total_err_count, ts->first_error);
/* Additional output if description is set */
if (strlen(ts->description))
- log_info(";%s", ts->description);
+ log_buf(out, ";%s", ts->description);
- log_info("\n");
+ log_buf(out, "\n");
}
static struct json_object *show_thread_status_json(struct thread_stat *ts,
struct group_run_stats *rs)
{
struct json_object *root, *tmp;
+ struct jobs_eta *je;
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
double io_u_lat_m[FIO_IO_U_LAT_M_NR];
double usr_cpu, sys_cpu;
int i;
+ size_t size;
root = json_create_object();
json_object_add_value_string(root, "jobname", ts->name);
json_object_add_value_int(root, "groupid", ts->groupid);
json_object_add_value_int(root, "error", ts->error);
+ /* ETA Info */
+ je = get_jobs_eta(1, &size);
+ if (je) {
+ json_object_add_value_int(root, "eta", je->eta_sec);
+ json_object_add_value_int(root, "elapsed", je->elapsed_sec);
+ }
+
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);
if (strlen(ts->description))
json_object_add_value_string(root, "desc", ts->description);
+ if (ts->nr_block_infos) {
+ /* Block error histogram and types */
+ int len;
+ unsigned int *percentiles = NULL;
+ unsigned int block_state_counts[BLOCK_STATE_COUNT];
+
+ len = calc_block_percentiles(ts->nr_block_infos, ts->block_infos,
+ ts->percentile_list,
+ &percentiles, block_state_counts);
+
+ if (len) {
+ struct json_object *block, *percentile_object, *states;
+ int state;
+ block = json_create_object();
+ json_object_add_value_object(root, "block", block);
+
+ percentile_object = json_create_object();
+ json_object_add_value_object(block, "percentiles",
+ percentile_object);
+ for (i = 0; i < len; i++) {
+ char buf[20];
+ snprintf(buf, sizeof(buf), "%f",
+ ts->percentile_list[i].u.f);
+ json_object_add_value_int(percentile_object,
+ (const char *)buf,
+ percentiles[i]);
+ }
+
+ states = json_create_object();
+ json_object_add_value_object(block, "states", states);
+ for (state = 0; state < BLOCK_STATE_COUNT; state++) {
+ json_object_add_value_int(states,
+ block_state_names[state],
+ block_state_counts[state]);
+ }
+ free(percentiles);
+ }
+ }
+
return root;
}
static void show_thread_status_terse(struct thread_stat *ts,
- struct group_run_stats *rs)
+ struct group_run_stats *rs,
+ struct buf_output *out)
{
if (terse_version == 2)
- show_thread_status_terse_v2(ts, rs);
+ show_thread_status_terse_v2(ts, rs, out);
else if (terse_version == 3 || terse_version == 4)
- show_thread_status_terse_v3_v4(ts, rs, terse_version);
+ show_thread_status_terse_v3_v4(ts, rs, terse_version, out);
else
log_err("fio: bad terse version!? %d\n", terse_version);
}
struct json_object *show_thread_status(struct thread_stat *ts,
- struct group_run_stats *rs)
+ struct group_run_stats *rs,
+ struct buf_output *out)
{
- if (output_format == FIO_OUTPUT_TERSE)
- show_thread_status_terse(ts, rs);
- else if (output_format == FIO_OUTPUT_JSON)
- return show_thread_status_json(ts, rs);
- else
- show_thread_status_normal(ts, rs);
- return NULL;
+ struct json_object *ret = NULL;
+
+ if (output_format & FIO_OUTPUT_TERSE)
+ show_thread_status_terse(ts, rs, out);
+ if (output_format & FIO_OUTPUT_JSON)
+ ret = show_thread_status_json(ts, rs);
+ if (output_format & FIO_OUTPUT_NORMAL)
+ show_thread_status_normal(ts, rs, out);
+
+ return ret;
}
static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
struct group_run_stats *runstats, *rs;
struct thread_data *td;
struct thread_stat *threadstats, *ts;
- int i, j, nr_ts, last_ts, idx;
+ int i, j, k, nr_ts, last_ts, idx;
int kb_base_warned = 0;
int unit_base_warned = 0;
struct json_object *root = NULL;
struct json_array *array = NULL;
+ struct buf_output output[FIO_OUTPUT_NR];
+
runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
for (i = 0; i < groupid + 1; i++)
ts->latency_percentile = td->o.latency_percentile;
ts->latency_window = td->o.latency_window;
+ ts->nr_block_infos = td->ts.nr_block_infos;
+ for (k = 0; k < ts->nr_block_infos; k++)
+ ts->block_infos[k] = td->ts.block_infos[k];
+
sum_thread_stats(ts, &td->ts, idx);
}
}
}
+ for (i = 0; i < FIO_OUTPUT_NR; i++)
+ buf_output_init(&output[i]);
+
/*
* don't overwrite last signal output
*/
- if (output_format == FIO_OUTPUT_NORMAL)
- log_info("\n");
- else if (output_format == FIO_OUTPUT_JSON) {
- char time_buf[64];
+ if (output_format & FIO_OUTPUT_NORMAL)
+ log_buf(&output[__FIO_OUTPUT_NORMAL], "\n");
+ if (output_format & FIO_OUTPUT_JSON) {
+ char time_buf[32];
time_t time_p;
time(&time_p);
if (is_backend)
fio_server_send_ts(ts, rs);
- else if (output_format == FIO_OUTPUT_TERSE)
- show_thread_status_terse(ts, rs);
- else if (output_format == FIO_OUTPUT_JSON) {
- struct json_object *tmp = show_thread_status_json(ts, rs);
- json_array_add_value_object(array, tmp);
- } else
- show_thread_status_normal(ts, rs);
+ else {
+ if (output_format & FIO_OUTPUT_TERSE)
+ show_thread_status_terse(ts, rs, &output[__FIO_OUTPUT_TERSE]);
+ if (output_format & FIO_OUTPUT_JSON) {
+ struct json_object *tmp = show_thread_status_json(ts, rs);
+ json_array_add_value_object(array, tmp);
+ }
+ if (output_format & FIO_OUTPUT_NORMAL)
+ show_thread_status_normal(ts, rs, &output[__FIO_OUTPUT_NORMAL]);
+ }
}
- if (output_format == FIO_OUTPUT_JSON) {
+ if (output_format & FIO_OUTPUT_JSON) {
/* disk util stats, if any */
- show_disk_util(1, root);
+ show_disk_util(1, root, &output[__FIO_OUTPUT_JSON]);
- show_idle_prof_stats(FIO_OUTPUT_JSON, root);
+ show_idle_prof_stats(FIO_OUTPUT_JSON, root, &output[__FIO_OUTPUT_JSON]);
- json_print_object(root);
- log_info("\n");
+ json_print_object(root, &output[__FIO_OUTPUT_JSON]);
+ log_buf(&output[__FIO_OUTPUT_JSON], "\n");
json_free_object(root);
}
rs->groupid = i;
if (is_backend)
fio_server_send_gs(rs);
- else if (output_format == FIO_OUTPUT_NORMAL)
- show_group_stats(rs);
+ else if (output_format & FIO_OUTPUT_NORMAL)
+ show_group_stats(rs, &output[__FIO_OUTPUT_NORMAL]);
}
if (is_backend)
fio_server_send_du();
- else if (output_format == FIO_OUTPUT_NORMAL) {
- show_disk_util(0, NULL);
- show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
+ else if (output_format & FIO_OUTPUT_NORMAL) {
+ show_disk_util(0, NULL, &output[__FIO_OUTPUT_NORMAL]);
+ show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL, &output[__FIO_OUTPUT_NORMAL]);
}
- if ( !(output_format == FIO_OUTPUT_TERSE) && append_terse_output) {
- log_info("\nAdditional Terse Output:\n");
-
- for (i = 0; i < nr_ts; i++) {
- ts = &threadstats[i];
- rs = &runstats[ts->groupid];
- show_thread_status_terse(ts, rs);
- }
+ for (i = 0; i < FIO_OUTPUT_NR; i++) {
+ buf_output_flush(&output[i]);
+ buf_output_free(&output[i]);
}
log_info_flush();
if (!ddir_rw(ddir))
return;
+ td_io_u_lock(td);
+
add_stat_sample(&ts->clat_stat[ddir], usec);
if (td->clat_log)
if (ts->clat_percentiles)
add_clat_percentile_sample(ts, usec, ddir);
+
+ td_io_u_unlock(td);
}
void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
if (!ddir_rw(ddir))
return;
+ td_io_u_lock(td);
+
add_stat_sample(&ts->slat_stat[ddir], usec);
if (td->slat_log)
add_log_sample(td, td->slat_log, usec, ddir, bs, offset);
+
+ td_io_u_unlock(td);
}
void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
if (!ddir_rw(ddir))
return;
+ td_io_u_lock(td);
+
add_stat_sample(&ts->lat_stat[ddir], usec);
if (td->lat_log)
add_log_sample(td, td->lat_log, usec, ddir, bs, offset);
+
+ td_io_u_unlock(td);
}
void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
if (spent < td->o.bw_avg_time)
return;
+ td_io_u_lock(td);
+
/*
* Compute both read and write rates for the interval.
*/
}
fio_gettime(&td->bw_sample_time, NULL);
+ td_io_u_unlock(td);
}
void add_iops_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
if (spent < td->o.iops_avg_time)
return;
+ td_io_u_lock(td);
+
/*
* Compute both read and write rates for the interval.
*/
}
fio_gettime(&td->iops_sample_time, NULL);
+ td_io_u_unlock(td);
}
void stat_init(void)
helper_do_stat = 1;
pthread_cond_signal(&helper_cond);
}
+
+uint32_t *io_u_block_info(struct thread_data *td, struct io_u *io_u)
+{
+ /* Ignore io_u's which span multiple blocks--they will just get
+ * inaccurate counts. */
+ int idx = (io_u->offset - io_u->file->file_offset)
+ / td->o.bs[DDIR_TRIM];
+ uint32_t *info = &td->ts.block_infos[idx];
+ assert(idx < td->ts.nr_block_infos);
+ return info;
+}
projects / fio.git / blobdiff