projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cpu mask setting
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 09d7daa4d5d40915c8072749f8b01a961bc983b9..39241c5aaf5a529dee695e86ef09c5c17d1efb15 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];
@@
-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,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,8
+210,9
@@
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) {
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;
@@
-214,6
+221,9
@@
void print_thread_status(void)
nr_running++;
t_rate += td->o.rate;
m_rate += td->o.ratemin;
nr_running++;
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);