projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eta: Fix ramp time ETA
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 3c1aeeee98cbd0cb0d3dcbe35f7c1287d7a39450..fe7b1e005301ae7741a4b07aa341d7bcde1842d3 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-235,7
+235,7
@@
static unsigned long thread_eta(struct thread_data *td)
|| td->runstate == TD_SETTING_UP
|| td->runstate == TD_RAMP
|| td->runstate == TD_PRE_READING) {
|| td->runstate == TD_SETTING_UP
|| td->runstate == TD_RAMP
|| td->runstate == TD_PRE_READING) {
- int t_eta = 0, r_eta = 0;
+ int
64_t
t_eta = 0, r_eta = 0;
unsigned long long rate_bytes;
/*
unsigned long long rate_bytes;
/*
@@
-259,9
+259,16
@@
static unsigned long thread_eta(struct thread_data *td)
t_eta -= ramp_left;
}
}
t_eta -= ramp_left;
}
}
- rate_bytes = ddir_rw_sum(td->o.rate);
+ rate_bytes = 0;
+ if (td_read(td))
+ rate_bytes = td->o.rate[DDIR_READ];
+ if (td_write(td))
+ rate_bytes += td->o.rate[DDIR_WRITE];
+ if (td_trim(td))
+ rate_bytes += td->o.rate[DDIR_TRIM];
+
if (rate_bytes) {
if (rate_bytes) {
- r_eta =
(bytes_total / 1024)
/ rate_bytes;
+ r_eta =
bytes_total
/ rate_bytes;
r_eta += (td->o.start_delay / 1000000ULL);
}
r_eta += (td->o.start_delay / 1000000ULL);
}
@@
-285,7
+292,7
@@
static unsigned long thread_eta(struct thread_data *td)
static void calc_rate(int unified_rw_rep, unsigned long mtime,
unsigned long long *io_bytes,
static void calc_rate(int unified_rw_rep, unsigned long mtime,
unsigned long long *io_bytes,
- unsigned long long *prev_io_bytes, u
nsigned in
t *rate)
+ unsigned long long *prev_io_bytes, u
int64_
t *rate)
{
int i;
{
int i;
@@
-341,7
+348,7
@@
bool calc_thread_status(struct jobs_eta *je, int force)
{
struct thread_data *td;
int i, unified_rw_rep;
{
struct thread_data *td;
int i, unified_rw_rep;
- u
nsigned long
rate_time, disp_time, bw_avg_time, *eta_secs;
+ u
int64_t
rate_time, disp_time, bw_avg_time, *eta_secs;
unsigned long long io_bytes[DDIR_RWDIR_CNT];
unsigned long long io_iops[DDIR_RWDIR_CNT];
struct timeval now;
unsigned long long io_bytes[DDIR_RWDIR_CNT];
unsigned long long io_iops[DDIR_RWDIR_CNT];
struct timeval now;
@@
-367,8
+374,8
@@
bool calc_thread_status(struct jobs_eta *je, int force)
if (!ddir_rw_sum(disp_io_bytes))
fill_start_time(&disp_prev_time);
if (!ddir_rw_sum(disp_io_bytes))
fill_start_time(&disp_prev_time);
- eta_secs = malloc(thread_number * sizeof(u
nsigned long
));
- memset(eta_secs, 0, thread_number * sizeof(u
nsigned long
));
+ eta_secs = malloc(thread_number * sizeof(u
int64_t
));
+ memset(eta_secs, 0, thread_number * sizeof(u
int64_t
));
je->elapsed_sec = (mtime_since_genesis() + 999) / 1000;
je->elapsed_sec = (mtime_since_genesis() + 999) / 1000;