projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad random offset generation for file map
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 9573e8a6c97fc950c1613af91876f1755a92b000..d93bf1a16f80ff51f9b025149568f3a199472970 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-7,7
+7,7
@@
#include "fio.h"
#include "fio.h"
-static char run_str[MAX_JOBS + 1];
+static char run_str[
REAL_
MAX_JOBS + 1];
/*
* Sets the status of the 'td' in the printed status map.
/*
* Sets the status of the 'td' in the printed status map.
@@
-28,10
+28,21
@@
static void check_str_update(struct thread_data *td)
break;
case TD_RUNNING:
if (td_rw(td)) {
break;
case TD_RUNNING:
if (td_rw(td)) {
- if (td_random(td))
- c = 'm';
- else
- c = 'M';
+ if (td_random(td)) {
+ if (td->o.rwmix[DDIR_READ] == 100)
+ c = 'r';
+ else if (td->o.rwmix[DDIR_WRITE] == 100)
+ c = 'w';
+ else
+ c = 'm';
+ } else {
+ if (td->o.rwmix[DDIR_READ] == 100)
+ c = 'R';
+ else if (td->o.rwmix[DDIR_WRITE] == 100)
+ c = 'W';
+ else
+ c = 'M';
+ }
} else if (td_read(td)) {
if (td_random(td))
c = 'r';
} else if (td_read(td)) {
if (td_random(td))
c = 'r';
@@
-110,6
+121,13
@@
static int thread_eta(struct thread_data *td)
bytes_total = td->total_io_size;
bytes_total = td->total_io_size;
+ if (td->o.fill_device && td->o.size == -1ULL) {
+ if (!td->fill_device_size || td->fill_device_size == -1ULL)
+ return 0;
+
+ bytes_total = td->fill_device_size;
+ }
+
/*
* 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.
@@
-124,9
+142,6
@@
static int thread_eta(struct thread_data *td)
if (td->o.zone_size && td->o.zone_skip)
bytes_total /= (td->o.zone_skip / td->o.zone_size);
if (td->o.zone_size && td->o.zone_skip)
bytes_total /= (td->o.zone_skip / td->o.zone_size);
- if (td->o.fill_device && td->o.size == -1ULL)
- return 0;
-
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
double perc, perc_t;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
double perc, perc_t;
@@
-157,19
+172,21
@@
static int thread_eta(struct thread_data *td)
* if given, otherwise assume it'll run at the specified rate.
*/
if (td->o.timeout) {
* if given, otherwise assume it'll run at the specified rate.
*/
if (td->o.timeout) {
- t_eta = td->o.timeout + td->o.start_delay;
+ t_eta = td->o.timeout + td->o.start_delay +
+ td->o.ramp_time;
if (in_ramp_time(td)) {
unsigned long ramp_left;
if (in_ramp_time(td)) {
unsigned long ramp_left;
- ramp_left = mtime_since_now(&td->
start
);
+ ramp_left = mtime_since_now(&td->
epoch
);
ramp_left = (ramp_left + 999) / 1000;
if (ramp_left <= t_eta)
t_eta -= ramp_left;
}
}
if (td->o.rate[0] || td->o.rate[1]) {
ramp_left = (ramp_left + 999) / 1000;
if (ramp_left <= t_eta)
t_eta -= ramp_left;
}
}
if (td->o.rate[0] || td->o.rate[1]) {
- r_eta = (bytes_total / 1024) / (td->o.rate[0] + td->o.rate[1]);
+ r_eta = (bytes_total / 1024) /
+ (td->o.rate[0] + td->o.rate[1]);
r_eta += td->o.start_delay;
}
r_eta += td->o.start_delay;
}
@@
-232,6
+249,7
@@
void print_thread_status(void)
static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
+ int i2p = 0;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
@@
-263,7
+281,8
@@
void print_thread_status(void)
t_rate += td->o.rate[0] + td->o.rate[1];
m_rate += td->o.ratemin[0] + td->o.ratemin[1];
t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
t_rate += td->o.rate[0] + td->o.rate[1];
m_rate += td->o.ratemin[0] + td->o.ratemin[1];
t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
- m_iops += td->o.rate_iops_min[0] + td->o.rate_iops_min[1];
+ m_iops += td->o.rate_iops_min[0] +
+ td->o.rate_iops_min[1];
files_open += td->nr_open_files;
} else if (td->runstate == TD_RAMP) {
nr_running++;
files_open += td->nr_open_files;
} else if (td->runstate == TD_RAMP) {
nr_running++;
@@
-292,6
+311,8
@@
void print_thread_status(void)
eta_sec = 0;
for_each_td(td, i) {
eta_sec = 0;
for_each_td(td, i) {
+ if (!i2p && is_power_of_2(td->o.kb_base))
+ i2p = 1;
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
@@
-319,7
+340,11
@@
void print_thread_status(void)
}
disp_time = mtime_since(&disp_prev_time, &now);
}
disp_time = mtime_since(&disp_prev_time, &now);
- if (disp_time < 1000)
+
+ /*
+ * Allow a little slack, the target is to print it every 1000 msecs
+ */
+ if (disp_time < 900)
return;
calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
return;
calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
@@
-334,9
+359,9
@@
void print_thread_status(void)
if (m_rate || t_rate) {
char *tr, *mr;
if (m_rate || t_rate) {
char *tr, *mr;
- mr = num2str(m_rate, 4, 0,
1
);
- tr = num2str(t_rate, 4, 0,
1
);
- printf(", CR=%s/%s K
i
B/s", tr, mr);
+ mr = num2str(m_rate, 4, 0,
i2p
);
+ tr = num2str(t_rate, 4, 0,
i2p
);
+ printf(", CR=%s/%s KB/s", tr, mr);
free(tr);
free(mr);
} else if (m_iops || t_iops)
free(tr);
free(mr);
} else if (m_iops || t_iops)
@@
-355,14
+380,14
@@
void print_thread_status(void)
sprintf(perc_str, "%3.1f%% done", perc);
}
sprintf(perc_str, "%3.1f%% done", perc);
}
- rate_str[0] = num2str(rate[0], 5, 10,
1
);
- rate_str[1] = num2str(rate[1], 5, 10,
1
);
+ rate_str[0] = num2str(rate[0], 5, 10,
i2p
);
+ rate_str[1] = num2str(rate[1], 5, 10,
i2p
);
iops_str[0] = num2str(iops[0], 4, 1, 0);
iops_str[1] = num2str(iops[1], 4, 1, 0);
l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
iops_str[0] = num2str(iops[0], 4, 1, 0);
iops_str[1] = num2str(iops[1], 4, 1, 0);
l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
- run_str, perc_str, rate_str[0], rate_str[1],
+ run_str, perc_str, rate_str[0], rate_str[1],
iops_str[0], iops_str[1], eta_str);
if (l >= 0 && l < linelen_last)
printf("%*s", linelen_last - l, "");
iops_str[0], iops_str[1], eta_str);
if (l >= 0 && l < linelen_last)
printf("%*s", linelen_last - l, "");
@@
-377,7
+402,7
@@
void print_thread_status(void)
fflush(stdout);
}
fflush(stdout);
}
-void print_status_init(int thr
ead
_number)
+void print_status_init(int thr_number)
{
{
- run_str[thr
ead
_number] = 'P';
+ run_str[thr_number] = 'P';
}
}