projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add display of major and minor faults
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 3c2316284909c88867c5981db71b93918e1ffef6..625b1f885e9899ea1e4d49639d73c14dcac6ec48 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-6,7
+6,6
@@
#include <string.h>
#include "fio.h"
#include <string.h>
#include "fio.h"
-#include "os.h"
static char run_str[MAX_JOBS + 1];
static char run_str[MAX_JOBS + 1];
@@
-108,28
+107,34
@@
static int thread_eta(struct thread_data *td, unsigned long elapsed)
* if writing, bytes_total will be twice the size. If mixing,
* assume a 50/50 split and thus bytes_total will be 50% larger.
*/
* if writing, bytes_total will be twice the size. If mixing,
* assume a 50/50 split and thus bytes_total will be 50% larger.
*/
- if (td->
verify
) {
+ if (td->
o.do_verify && td->o.verify && td_write(td)
) {
if (td_rw(td))
bytes_total = bytes_total * 3 / 2;
else
bytes_total <<= 1;
}
if (td_rw(td))
bytes_total = bytes_total * 3 / 2;
else
bytes_total <<= 1;
}
- if (td->
zone_size && td->
zone_skip)
- bytes_total /= (td->
zone_skip / td->
zone_size);
+ if (td->
o.zone_size && td->o.
zone_skip)
+ bytes_total /= (td->
o.zone_skip / td->o.
zone_size);
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
- double perc;
+ double perc
, perc_t
;
bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
perc = (double) bytes_done / (double) bytes_total;
if (perc > 1.0)
perc = 1.0;
bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
perc = (double) bytes_done / (double) bytes_total;
if (perc > 1.0)
perc = 1.0;
+ if (td->o.time_based) {
+ perc_t = (double) elapsed / (double) td->o.timeout;
+ if (perc_t < perc)
+ perc = perc_t;
+ }
+
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
- if (td->
timeout && eta_sec > (td->
timeout - elapsed))
- eta_sec = td->timeout - elapsed;
+ if (td->
o.timeout && eta_sec > (td->o.
timeout - elapsed))
+ eta_sec = td->
o.
timeout - elapsed;
} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
|| td->runstate == TD_INITIALIZED) {
int t_eta = 0, r_eta = 0;
} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
|| td->runstate == TD_INITIALIZED) {
int t_eta = 0, r_eta = 0;
@@
-138,11
+143,11
@@
static int thread_eta(struct thread_data *td, unsigned long elapsed)
* We can only guess - assume it'll run the full timeout
* if given, otherwise assume it'll run at the specified rate.
*/
* We can only guess - assume it'll run the full timeout
* if given, otherwise assume it'll run at the specified rate.
*/
- if (td->timeout)
- t_eta = td->
timeout + td->
start_delay - elapsed;
- if (td->rate) {
- r_eta = (bytes_total / 1024) / td->rate;
- r_eta += td->start_delay - elapsed;
+ if (td->
o.
timeout)
+ t_eta = td->
o.timeout + td->o.
start_delay - elapsed;
+ if (td->
o.
rate) {
+ r_eta = (bytes_total / 1024) / td->
o.
rate;
+ r_eta += td->
o.
start_delay - elapsed;
}
if (r_eta && t_eta)
}
if (r_eta && t_eta)
@@
-180,6
+185,7
@@
void print_thread_status(void)
{
unsigned long elapsed = mtime_since_genesis() / 1000;
int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec;
{
unsigned long elapsed = mtime_since_genesis() / 1000;
int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec;
+ int t_iops, m_iops, files_open;
struct thread_data *td;
char eta_str[128];
double perc = 0.0;
struct thread_data *td;
char eta_str[128];
double perc = 0.0;
@@
-204,16
+210,20
@@
void print_thread_status(void)
memset(eta_secs, 0, thread_number * sizeof(int));
io_bytes[0] = io_bytes[1] = 0;
memset(eta_secs, 0, thread_number * sizeof(int));
io_bytes[0] = io_bytes[1] = 0;
- nr_pending = nr_running = t_rate = m_rate = 0;
+ nr_pending = nr_running = t_rate = m_rate =
t_iops = m_iops =
0;
bw_avg_time = ULONG_MAX;
bw_avg_time = ULONG_MAX;
+ files_open = 0;
for_each_td(td, i) {
for_each_td(td, i) {
- if (td->bw_avg_time < bw_avg_time)
- bw_avg_time = td->bw_avg_time;
+ if (td->
o.
bw_avg_time < bw_avg_time)
+ bw_avg_time = td->
o.
bw_avg_time;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
|| td->runstate == TD_FSYNCING) {
nr_running++;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
|| td->runstate == TD_FSYNCING) {
nr_running++;
- t_rate += td->rate;
- m_rate += td->ratemin;
+ t_rate += td->o.rate;
+ m_rate += td->o.ratemin;
+ t_iops += td->o.rate_iops;
+ m_iops += td->o.rate_iops_min;
+ files_open += td->nr_open_files;
} else if (td->runstate < TD_RUNNING)
nr_pending++;
} else if (td->runstate < TD_RUNNING)
nr_pending++;
@@
-269,9
+279,11
@@
void print_thread_status(void)
if (!nr_running && !nr_pending)
return;
if (!nr_running && !nr_pending)
return;
- printf("Jobs: %d
", nr_running
);
+ printf("Jobs: %d
(f=%d)", nr_running, files_open
);
if (m_rate || t_rate)
printf(", CR=%d/%d KiB/s", t_rate, m_rate);
if (m_rate || t_rate)
printf(", CR=%d/%d KiB/s", t_rate, m_rate);
+ else if (m_iops || t_iops)
+ printf(", CR=%d/%d IOPS", t_iops, m_iops);
if (eta_sec != INT_MAX && nr_running) {
perc *= 100.0;
printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);
if (eta_sec != INT_MAX && nr_running) {
perc *= 100.0;
printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);