t_eta -= ramp_left;
}
}
- if (td->o.rate) {
- r_eta = (bytes_total / 1024) / td->o.rate;
+ if (td->o.rate[0] || td->o.rate[1]) {
+ r_eta = (bytes_total / 1024) / (td->o.rate[0] + td->o.rate[1]);
r_eta += td->o.start_delay;
}
prev_io_bytes[1] = io_bytes[1];
}
+static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
+ unsigned long long *prev_io_iops, unsigned int *iops)
+{
+ iops[0] = ((io_iops[0] - prev_io_iops[0]) * 1000) / mtime;
+ iops[1] = ((io_iops[1] - prev_io_iops[1]) * 1000) / mtime;
+ prev_io_iops[0] = io_iops[0];
+ prev_io_iops[1] = io_iops[1];
+}
+
/*
* Print status of the jobs we know about. This includes rate estimates,
* ETA, thread state, etc.
struct thread_data *td;
char eta_str[128];
double perc = 0.0;
- unsigned long long io_bytes[2];
+ unsigned long long io_bytes[2], io_iops[2];
unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
struct timeval now;
static unsigned long long rate_io_bytes[2];
static unsigned long long disp_io_bytes[2];
+ static unsigned long long disp_io_iops[2];
static struct timeval rate_prev_time, disp_prev_time;
- static unsigned int rate[2];
+ static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
+ int i2p = 0;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
memset(eta_secs, 0, thread_number * sizeof(unsigned long));
io_bytes[0] = io_bytes[1] = 0;
+ io_iops[0] = io_iops[1] = 0;
nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
nr_ramp = 0;
bw_avg_time = ULONG_MAX;
|| td->runstate == TD_FSYNCING
|| td->runstate == TD_PRE_READING) {
nr_running++;
- t_rate += td->o.rate;
- m_rate += td->o.ratemin;
- t_iops += td->o.rate_iops;
- m_iops += td->o.rate_iops_min;
+ t_rate += td->o.rate[0] + td->o.rate[1];
+ m_rate += td->o.ratemin[0] + td->o.ratemin[1];
+ t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
+ m_iops += td->o.rate_iops_min[0] + td->o.rate_iops_min[1];
files_open += td->nr_open_files;
} else if (td->runstate == TD_RAMP) {
nr_running++;
if (td->runstate > TD_RAMP) {
io_bytes[0] += td->io_bytes[0];
io_bytes[1] += td->io_bytes[1];
+ io_iops[0] += td->io_blocks[0];
+ io_iops[1] += td->io_blocks[1];
}
}
eta_sec = 0;
for_each_td(td, i) {
+ if (!i2p && is_power_of_2(td->o.kb_base))
+ i2p = 1;
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
return;
calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+ calc_iops(disp_time, io_iops, disp_io_iops, iops);
+
memcpy(&disp_prev_time, &now, sizeof(now));
if (!nr_running && !nr_pending)
return;
printf("Jobs: %d (f=%d)", nr_running, files_open);
- if (m_rate || t_rate)
- printf(", CR=%d/%d KiB/s", t_rate, m_rate);
- else if (m_iops || t_iops)
+ if (m_rate || t_rate) {
+ char *tr, *mr;
+
+ mr = num2str(m_rate, 4, 0, i2p);
+ tr = num2str(t_rate, 4, 0, i2p);
+ printf(", CR=%s/%s KB/s", tr, mr);
+ free(tr);
+ free(mr);
+ } else if (m_iops || t_iops)
printf(", CR=%d/%d IOPS", t_iops, m_iops);
if (eta_sec != INT_MAX && nr_running) {
char perc_str[32];
- int ll;
+ char *iops_str[2];
+ char *rate_str[2];
+ int l;
if ((!eta_sec && !eta_good) || nr_ramp == nr_running)
strcpy(perc_str, "-.-% done");
sprintf(perc_str, "%3.1f%% done", perc);
}
- ll = printf(": [%s] [%s] [%6u/%6u kb/s] [eta %s]",
- run_str, perc_str, rate[0], rate[1], eta_str);
- if (ll >= 0 && ll < linelen_last)
- printf("%*s", linelen_last - ll, "");
- linelen_last = ll;
+ rate_str[0] = num2str(rate[0], 5, 10, i2p);
+ rate_str[1] = num2str(rate[1], 5, 10, i2p);
+
+ iops_str[0] = num2str(iops[0], 4, 1, 0);
+ iops_str[1] = num2str(iops[1], 4, 1, 0);
+
+ l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
+ run_str, perc_str, rate_str[0], rate_str[1],
+ iops_str[0], iops_str[1], eta_str);
+ if (l >= 0 && l < linelen_last)
+ printf("%*s", linelen_last - l, "");
+ linelen_last = l;
+
+ free(rate_str[0]);
+ free(rate_str[1]);
+ free(iops_str[0]);
+ free(iops_str[1]);
}
printf("\r");
fflush(stdout);