projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make weak posix_memalign() private to Solaris
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 9573e8a6c97fc950c1613af91876f1755a92b000..53dcc93aa4d6b157d7d64037d34ad99526cb10ce 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-169,7
+169,8
@@
static int thread_eta(struct thread_data *td)
}
}
if (td->o.rate[0] || td->o.rate[1]) {
}
}
if (td->o.rate[0] || td->o.rate[1]) {
- r_eta = (bytes_total / 1024) / (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;
}
r_eta += td->o.start_delay;
}
@@
-232,6
+233,7
@@
void print_thread_status(void)
static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
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;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
@@
-263,7
+265,8
@@
void print_thread_status(void)
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];
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];
+ 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++;
files_open += td->nr_open_files;
} else if (td->runstate == TD_RAMP) {
nr_running++;
@@
-292,6
+295,8
@@
void print_thread_status(void)
eta_sec = 0;
for_each_td(td, i) {
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];
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
@@
-334,9
+339,9
@@
void print_thread_status(void)
if (m_rate || t_rate) {
char *tr, *mr;
if (m_rate || t_rate) {
char *tr, *mr;
- mr = num2str(m_rate, 4, 0,
1
);
- tr = num2str(t_rate, 4, 0,
1
);
- printf(", CR=%s/%s K
i
B/s", 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)
free(tr);
free(mr);
} else if (m_iops || t_iops)
@@
-355,14
+360,14
@@
void print_thread_status(void)
sprintf(perc_str, "%3.1f%% done", perc);
}
sprintf(perc_str, "%3.1f%% done", perc);
}
- rate_str[0] = num2str(rate[0], 5, 10,
1
);
- rate_str[1] = num2str(rate[1], 5, 10,
1
);
+ 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]",
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],
+ 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, "");
iops_str[0], iops_str[1], eta_str);
if (l >= 0 && l < linelen_last)
printf("%*s", linelen_last - l, "");