projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://github.com/rootfs/fio
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index b0501029c2b29c2e0ea6925be1d39b66e6cd17d5..7500082f4e2398da125b8a1a01cc7e981a021222 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-74,6
+74,9
@@
static void check_str_update(struct thread_data *td)
case TD_FSYNCING:
c = 'F';
break;
case TD_FSYNCING:
c = 'F';
break;
+ case TD_FINISHING:
+ c = 'f';
+ break;
case TD_CREATED:
c = 'C';
break;
case TD_CREATED:
c = 'C';
break;
@@
-171,14
+174,26
@@
static int thread_eta(struct thread_data *td)
double perc, perc_t;
bytes_done = ddir_rw_sum(td->io_bytes);
double perc, perc_t;
bytes_done = ddir_rw_sum(td->io_bytes);
- perc = (double) bytes_done / (double) bytes_total;
- if (perc > 1.0)
- perc = 1.0;
+
+ if (bytes_total) {
+ perc = (double) bytes_done / (double) bytes_total;
+ if (perc > 1.0)
+ perc = 1.0;
+ } else
+ perc = 0.0;
if (td->o.time_based) {
if (td->o.time_based) {
- perc_t = (double) elapsed / (double) timeout;
- if (perc_t < perc)
- perc = perc_t;
+ if (timeout) {
+ perc_t = (double) elapsed / (double) timeout;
+ if (perc_t < perc)
+ perc = perc_t;
+ } else {
+ /*
+ * Will never hit, we can't have time_based
+ * without a timeout set.
+ */
+ perc = 0.0;
+ }
}
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
}
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
@@
-331,7
+346,8
@@
int calc_thread_status(struct jobs_eta *je, int force)
bw_avg_time = td->o.bw_avg_time;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
|| td->runstate == TD_FSYNCING
bw_avg_time = td->o.bw_avg_time;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
|| td->runstate == TD_FSYNCING
- || td->runstate == TD_PRE_READING) {
+ || td->runstate == TD_PRE_READING
+ || td->runstate == TD_FINISHING) {
je->nr_running++;
if (td_read(td)) {
je->t_rate[0] += td->o.rate[DDIR_READ];
je->nr_running++;
if (td_read(td)) {
je->t_rate[0] += td->o.rate[DDIR_READ];