It was off by 1024/1024 :/
Initial patch from Carl Henrik Lunde <chlunde@ping.uio.no>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
if (!rs->max_run[i])
continue;
if (!rs->max_run[i])
continue;
- 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);
+ p1 = num2str(rs->io_kb[i], 6, 1024, 1);
+ p2 = num2str(rs->agg[i], 6, 1024, 1);
+ p3 = num2str(rs->min_bw[i], 6, 1024, 1);
+ p4 = num2str(rs->max_bw[i], 6, 1024, 1);
log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s,"
" mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2,
log_info("%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s,"
" mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2,
int ddir)
{
const char *ddir_str[] = { "read ", "write" };
int ddir)
{
const char *ddir_str[] = { "read ", "write" };
- unsigned long min, max;
+ unsigned long min, max, runt;
unsigned long long bw, iops;
double mean, dev;
char *io_p, *bw_p, *iops_p;
unsigned long long bw, iops;
double mean, dev;
char *io_p, *bw_p, *iops_p;
if (!ts->runtime[ddir])
return;
if (!ts->runtime[ddir])
return;
- bw = ts->io_bytes[ddir] / ts->runtime[ddir];
- 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);
+ runt = ts->runtime[ddir];
+
+ bw = (1000 * ts->io_bytes[ddir]) / runt;
+ io_p = num2str(ts->io_bytes[ddir] >> 10, 6, 1024, 1);
+ bw_p = num2str(bw >> 10, 6, 1024, 1);
+
+ iops = (1000 * ts->total_io_u[ddir]) / runt;
iops_p = num2str(iops, 6, 1, 0);
log_info(" %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n",
iops_p = num2str(iops, 6, 1, 0);
log_info(" %s: io=%siB, bw=%siB/s, iops=%s, runt=%6lumsec\n",
rs->max_run[j] = ts->runtime[j];
bw = 0;
rs->max_run[j] = ts->runtime[j];
bw = 0;
- if (ts->runtime[j])
- bw = ts->io_bytes[j]
- / (unsigned long long) ts->runtime[j];
+ if (ts->runtime[j]) {
+ unsigned long runt;
+
+ runt = ts->runtime[j] * 1024 / 1000;
+ bw = ts->io_bytes[j] / runt;
+ }
if (bw < rs->min_bw[j])
rs->min_bw[j] = bw;
if (bw > rs->max_bw[j])
if (bw < rs->min_bw[j])
rs->min_bw[j] = bw;
if (bw > rs->max_bw[j])
}
for (i = 0; i < groupid + 1; i++) {
}
for (i = 0; i < groupid + 1; i++) {
+ unsigned long max_run[2];
+
+ max_run[0] = rs->max_run[0] * 1024 / 1000;
+ max_run[1] = rs->max_run[1] * 1024 / 1000;
- rs->agg[0] = (rs->io_kb[0]*1024) / rs->max_run[0];
+ rs->agg[0] = (rs->io_kb[0]*1024) / max_run[0];
- rs->agg[1] = (rs->io_kb[1]*1024) / rs->max_run[1];
+ rs->agg[1] = (rs->io_kb[1]*1024) / max_run[1];
if (spent < td->o.bw_avg_time)
return;
if (spent < td->o.bw_avg_time)
return;
- rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) / spent;
+ rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) * 1000 / spent / 1024;
add_stat_sample(&ts->bw_stat[ddir], rate);
if (ts->bw_log)
add_stat_sample(&ts->bw_stat[ddir], rate);
if (ts->bw_log)