projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Random map fix
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 339f6568b16de68bb3e6af774dd875367f5f6292..fc485985ec6a833eaf57f26c83cac8d4689e1e15 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-70,7
+70,7
@@
static void check_str_update(struct thread_data *td)
static void eta_to_str(char *str, int eta_sec)
{
unsigned int d, h, m, s;
static void eta_to_str(char *str, int eta_sec)
{
unsigned int d, h, m, s;
-
static int always_d, always_h
;
+
int disp_hour = 0
;
d = h = m = s = 0;
d = h = m = s = 0;
@@
-82,17
+82,16
@@
static void eta_to_str(char *str, int eta_sec)
eta_sec /= 24;
d = eta_sec;
eta_sec /= 24;
d = eta_sec;
- if (d || always_d) {
- always_d = 1;
- str += sprintf(str, "%02dd:", d);
- }
- if (h || always_h) {
- always_h = 1;
- str += sprintf(str, "%02dh:", h);
+ if (d) {
+ disp_hour = 1;
+ str += sprintf(str, "%02ud:", d);
}
}
- str += sprintf(str, "%02dm:", m);
- str += sprintf(str, "%02ds", s);
+ if (h || disp_hour)
+ str += sprintf(str, "%02uh:", h);
+
+ str += sprintf(str, "%02um:", m);
+ str += sprintf(str, "%02us", s);
}
/*
}
/*
@@
-101,7
+100,7
@@
static void eta_to_str(char *str, int eta_sec)
static int thread_eta(struct thread_data *td, unsigned long elapsed)
{
unsigned long long bytes_total, bytes_done;
static int thread_eta(struct thread_data *td, unsigned long elapsed)
{
unsigned long long bytes_total, bytes_done;
- unsigned
int
eta_sec = 0;
+ unsigned
long
eta_sec = 0;
bytes_total = td->total_io_size;
bytes_total = td->total_io_size;
@@
-127,7
+126,7
@@
static int thread_eta(struct thread_data *td, unsigned long elapsed)
if (perc > 1.0)
perc = 1.0;
if (perc > 1.0)
perc = 1.0;
- eta_sec = (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->timeout && eta_sec > (td->timeout - elapsed))
eta_sec = td->timeout - elapsed;
@@
-180,7
+179,7
@@
void print_thread_status(void)
static struct timeval prev_time;
static unsigned int r_rate, w_rate;
unsigned long long io_bytes[2];
static struct timeval prev_time;
static unsigned int r_rate, w_rate;
unsigned long long io_bytes[2];
- unsigned long mtime;
+ unsigned long mtime
, bw_avg_time
;
if (temp_stall_ts || terse_output)
return;
if (temp_stall_ts || terse_output)
return;
@@
-193,7
+192,10
@@
void print_thread_status(void)
io_bytes[0] = io_bytes[1] = 0;
nr_pending = nr_running = t_rate = m_rate = 0;
io_bytes[0] = io_bytes[1] = 0;
nr_pending = nr_running = t_rate = m_rate = 0;
+ bw_avg_time = ULONG_MAX;
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->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++;
@@
-235,22
+237,26
@@
void print_thread_status(void)
}
mtime = mtime_since_now(&prev_time);
}
mtime = mtime_since_now(&prev_time);
- if (mtime >
1000
) {
+ if (mtime >
bw_avg_time
) {
r_rate = (io_bytes[0] - prev_io_bytes[0]) / mtime;
w_rate = (io_bytes[1] - prev_io_bytes[1]) / mtime;
r_rate = (io_bytes[0] - prev_io_bytes[0]) / mtime;
w_rate = (io_bytes[1] - prev_io_bytes[1]) / mtime;
- gettimeofday(&prev_time, NULL);
+ fio_gettime(&prev_time, NULL);
+ if (write_bw_log) {
+ add_agg_sample(r_rate, DDIR_READ);
+ add_agg_sample(w_rate, DDIR_WRITE);
+ }
memcpy(prev_io_bytes, io_bytes, sizeof(io_bytes));
}
if (!nr_running && !nr_pending)
return;
memcpy(prev_io_bytes, io_bytes, sizeof(io_bytes));
}
if (!nr_running && !nr_pending)
return;
- printf("Threads
running
: %d", nr_running);
+ printf("Threads: %d", nr_running);
if (m_rate || t_rate)
if (m_rate || t_rate)
- printf(",
commitrate %d/%dKiB/sec
", t_rate, m_rate);
+ printf(",
CR=%d/%d KiB/s
", t_rate, m_rate);
if (eta_sec != INT_MAX && nr_running) {
perc *= 100.0;
if (eta_sec != INT_MAX && nr_running) {
perc *= 100.0;
- printf(": [%s] [%3.
2
f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, r_rate, w_rate, eta_str);
+ printf(": [%s] [%3.
1
f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, r_rate, w_rate, eta_str);
}
printf("\r");
fflush(stdout);
}
printf("\r");
fflush(stdout);