/*
* Cheesy number->string conversion, complete with carry rounding error.
*/
-static char *num2str(unsigned long num, int maxlen, int base)
+static char *num2str(unsigned long num, int maxlen, int base, int pow2)
{
- /*
- * could be passed in for 10^3 base, but every caller expects
- * 2^10 base right now.
- */
- const unsigned int thousand = 1024;
- char postfix[] = { 'K', 'M', 'G', 'P', 'E' };
+ char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
+ unsigned int thousand;
char *buf;
int i;
+ if (pow2)
+ thousand = 1024;
+ else
+ thousand = 1000;
+
buf = malloc(128);
for (i = 0; base > 1; i++)
len = sprintf(buf, "%'lu", num);
if (len <= maxlen) {
- buf[len] = postfix[i];
- buf[len + 1] = '\0';
+ if (i >= 1) {
+ buf[len] = postfix[i];
+ buf[len + 1] = '\0';
+ }
return buf;
}
return found;
}
-void init_disk_util(struct thread_data *td)
+static void __init_disk_util(struct thread_data *td, struct fio_file *f)
{
- struct fio_file *f;
struct stat st;
char foo[PATH_MAX], tmp[PATH_MAX];
dev_t dev;
char *p;
- if (!td->do_disk_util || (td->io_ops->flags & FIO_DISKLESSIO))
- return;
-
- /*
- * Just use the same file, they are on the same device.
- */
- f = &td->files[0];
if (!stat(f->file_name, &st)) {
if (S_ISBLK(st.st_mode))
dev = st.st_rdev;
sprintf(foo, "%s", tmp);
}
- if (td->ioscheduler)
+ if (td->ioscheduler && !td->sysfs_root)
td->sysfs_root = strdup(foo);
disk_util_add(dev, foo);
}
+void init_disk_util(struct thread_data *td)
+{
+ struct fio_file *f;
+ unsigned int i;
+
+ if (!td->do_disk_util ||
+ (td->io_ops->flags & (FIO_DISKLESSIO | FIO_NODISKUTIL)))
+ return;
+
+ for_each_file(td, f, i)
+ __init_disk_util(td, f);
+}
+
void disk_util_timer_arm(void)
{
itimer.it_value.tv_sec = 0;
if (!rs->max_run[i])
continue;
- p1 = num2str(rs->io_kb[i], 6, 1);
- p2 = num2str(rs->agg[i], 6, 1);
- p3 = num2str(rs->min_bw[i], 6, 1);
- p4 = num2str(rs->max_bw[i], 6, 1);
+ p1 = num2str(rs->io_kb[i], 6, 1000, 1);
+ p2 = num2str(rs->agg[i], 6, 1000, 1);
+ p3 = num2str(rs->min_bw[i], 6, 1000, 1);
+ p4 = num2str(rs->max_bw[i], 6, 1000, 1);
- fprintf(f_out, "%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[0], rs->max_run[0]);
+ fprintf(f_out, "%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[i], rs->max_run[i]);
free(p1);
free(p2);
}
}
+#define ts_total_io_u(ts) \
+ ((ts)->total_io_u[0] + (ts)->total_io_u[1])
+
static void stat_calc_dist(struct thread_stat *ts, double *io_u_dist)
{
int i;
* Do depth distribution calculations
*/
for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
- io_u_dist[i] = (double) ts->io_u_map[i] / (double) ts->total_io_u;
+ io_u_dist[i] = (double) ts->io_u_map[i] / (double) ts_total_io_u(ts);
io_u_dist[i] *= 100.0;
}
}
* Do latency distribution calculations
*/
for (i = 0; i < FIO_IO_U_LAT_NR; i++) {
- io_u_lat[i] = (double) ts->io_u_lat[i] / (double) ts->total_io_u;
+ io_u_lat[i] = (double) ts->io_u_lat[i] / (double) ts_total_io_u(ts);
io_u_lat[i] *= 100.0;
}
}
{
const char *ddir_str[] = { "read ", "write" };
unsigned long min, max;
- unsigned long long bw;
+ unsigned long long bw, iops;
double mean, dev;
- char *io_p, *bw_p;
+ char *io_p, *bw_p, *iops_p;
if (!ts->runtime[ddir])
return;
bw = ts->io_bytes[ddir] / ts->runtime[ddir];
- io_p = num2str(ts->io_bytes[ddir] >> 10, 6, 1);
- bw_p = num2str(bw, 6, 1);
+ iops = (1000 * ts->total_io_u[ddir]) / ts->runtime[ddir];
+ io_p = num2str(ts->io_bytes[ddir] >> 10, 6, 1000, 1);
+ bw_p = num2str(bw, 6, 1000, 1);
+ iops_p = num2str(iops, 6, 1, 0);
- fprintf(f_out, " %s: io=%siB, bw=%siB/s, runt=%6lumsec\n", ddir_str[ddir], io_p, bw_p, ts->runtime[ddir]);
+ fprintf(f_out, " %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n", ddir_str[ddir], io_p, bw_p, iops_p, ts->runtime[ddir]);
free(io_p);
free(bw_p);
+ free(iops_p);
if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
fprintf(f_out, " slat (msec): min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", min, max, mean, dev);
fprintf(f_out, "\n");
}
-static void __sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
+static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
{
double mean, S;
dst->S = S;
}
-static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
-{
- __sum_stat(&dst[DDIR_READ], &src[DDIR_READ], nr);
- __sum_stat(&dst[DDIR_WRITE], &src[DDIR_WRITE], nr);
-}
-
void show_run_stats(void)
{
struct group_run_stats *runstats, *rs;
struct thread_data *td;
struct thread_stat *threadstats, *ts;
- int i, j, k, nr_ts, last_ts, members;
+ int i, j, k, l, nr_ts, last_ts, idx;
runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
ts = &threadstats[i];
memset(ts, 0, sizeof(*ts));
- ts->clat_stat[0].min_val = -1UL;
- ts->clat_stat[1].min_val = -1UL;
- ts->slat_stat[0].min_val = -1UL;
- ts->slat_stat[1].min_val = -1UL;
- ts->bw_stat[0].min_val = -1UL;
- ts->bw_stat[1].min_val = -1UL;
+ for (j = 0; j <= DDIR_WRITE; j++) {
+ ts->clat_stat[j].min_val = -1UL;
+ ts->slat_stat[j].min_val = -1UL;
+ ts->bw_stat[j].min_val = -1UL;
+ }
+ ts->groupid = -1;
}
j = 0;
last_ts = -1;
- members = 0;
+ idx = 0;
for_each_td(td, i) {
+ if (idx && (!td->group_reporting ||
+ (td->group_reporting && last_ts != td->groupid))) {
+ idx = 0;
+ j++;
+ }
+
+ last_ts = td->groupid;
+
ts = &threadstats[j];
- members++;
+ idx++;
ts->members++;
- if (!ts->groupid) {
+ if (ts->groupid == -1) {
/*
* These are per-group shared already
*/
ts->verror = td->verror;
}
- sum_stat(ts->clat_stat, td->ts.clat_stat, members);
- sum_stat(ts->slat_stat, td->ts.slat_stat, members);
- sum_stat(ts->bw_stat, td->ts.bw_stat, members);
+ for (l = 0; l <= DDIR_WRITE; l++) {
+ sum_stat(&ts->clat_stat[l], &td->ts.clat_stat[l], idx);
+ sum_stat(&ts->slat_stat[l], &td->ts.slat_stat[l], idx);
+ sum_stat(&ts->bw_stat[l], &td->ts.bw_stat[l], idx);
+
+ ts->stat_io_bytes[l] += td->ts.stat_io_bytes[l];
+ ts->io_bytes[l] += td->ts.io_bytes[l];
- ts->stat_io_bytes[0] += td->ts.stat_io_bytes[0];
- ts->stat_io_bytes[1] += td->ts.stat_io_bytes[1];
+ if (ts->runtime[l] < td->ts.runtime[l])
+ ts->runtime[l] = td->ts.runtime[l];
+ }
ts->usr_time += td->ts.usr_time;
ts->sys_time += td->ts.sys_time;
for (k = 0; k < FIO_IO_U_LAT_NR; k++)
ts->io_u_lat[k] += td->ts.io_u_lat[k];
- ts->total_io_u += td->ts.total_io_u;
- ts->io_bytes[0] += td->ts.io_bytes[0];
- ts->io_bytes[1] += td->ts.io_bytes[1];
-
- if (ts->runtime[0] < td->ts.runtime[0])
- ts->runtime[0] = td->ts.runtime[0];
- if (ts->runtime[1] < td->ts.runtime[1])
- ts->runtime[1] = td->ts.runtime[1];
+ for (k = 0; k <= DDIR_WRITE; k++)
+ ts->total_io_u[k] += td->ts.total_io_u[k];
ts->total_run_time += td->ts.total_run_time;
-
- if (!td->group_reporting) {
- members = 0;
- j++;
- continue;
- }
- if (last_ts == td->groupid)
- continue;
-
- if (last_ts != -1) {
- members = 0;
- j++;
- }
-
- last_ts = td->groupid;
}
for (i = 0; i < nr_ts; i++) {
ts = &threadstats[i];
rs = &runstats[ts->groupid];
- for (j = 0; j < 2; j++) {
+ for (j = 0; j <= DDIR_WRITE; j++) {
if (!ts->runtime[j])
continue;
if (ts->runtime[j] < rs->min_run[j] || !rs->min_run[j])
projects / fio.git / blobdiff