projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
splice: automatically detect whether vmsplice-to-user works
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 3089e3f3bdff2525e59d52a0af6984eb1e36546a..350815ee6a9e7d244f9131954b8358eb36fbd91f 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,7
+107,7
@@
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->o.verify) {
+ if (td->o.
do_verify && td->o.
verify) {
if (td_rw(td))
bytes_total = bytes_total * 3 / 2;
else
if (td_rw(td))
bytes_total = bytes_total * 3 / 2;
else
@@
-119,13
+118,19
@@
static int thread_eta(struct thread_data *td, unsigned long elapsed)
bytes_total /= (td->o.zone_skip / td->o.zone_size);
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
bytes_total /= (td->o.zone_skip / td->o.zone_size);
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;
if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
@@
-180,7
+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;
+ 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;
@@
-207,6
+212,7
@@
void print_thread_status(void)
io_bytes[0] = io_bytes[1] = 0;
nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
bw_avg_time = ULONG_MAX;
io_bytes[0] = io_bytes[1] = 0;
nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
bw_avg_time = ULONG_MAX;
+ files_open = 0;
for_each_td(td, i) {
if (td->o.bw_avg_time < bw_avg_time)
bw_avg_time = td->o.bw_avg_time;
for_each_td(td, i) {
if (td->o.bw_avg_time < bw_avg_time)
bw_avg_time = td->o.bw_avg_time;
@@
-217,6
+223,7
@@
void print_thread_status(void)
m_rate += td->o.ratemin;
t_iops += td->o.rate_iops;
m_iops += td->o.rate_iops_min;
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++;
@@
-272,7
+279,7
@@
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);
else if (m_iops || t_iops)
if (m_rate || t_rate)
printf(", CR=%d/%d KiB/s", t_rate, m_rate);
else if (m_iops || t_iops)