case TD_EXITED:
c = 'E';
break;
+ case TD_RAMP:
+ c = '/';
+ break;
case TD_RUNNING:
if (td_rw(td)) {
if (td_random(td))
c = 'W';
}
break;
+ case TD_PRE_READING:
+ c = 'p';
+ break;
case TD_VERIFYING:
c = 'V';
break;
/*
* Convert seconds to a printable string.
*/
-static void eta_to_str(char *str, int eta_sec)
+static void eta_to_str(char *str, unsigned long eta_sec)
{
unsigned int d, h, m, s;
int disp_hour = 0;
/*
* Best effort calculation of the estimated pending runtime of a job.
*/
-static int thread_eta(struct thread_data *td, unsigned long elapsed)
+static int thread_eta(struct thread_data *td)
{
unsigned long long bytes_total, bytes_done;
unsigned long eta_sec = 0;
+ unsigned long elapsed;
+
+ elapsed = (mtime_since_now(&td->epoch) + 999) / 1000;
bytes_total = td->total_io_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;
eta_sec > (td->o.timeout + done_secs - elapsed))
eta_sec = td->o.timeout + done_secs - elapsed;
} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
- || td->runstate == TD_INITIALIZED) {
+ || td->runstate == TD_INITIALIZED
+ || td->runstate == TD_RAMP
+ || td->runstate == TD_PRE_READING) {
int t_eta = 0, r_eta = 0;
/*
* We can only guess - assume it'll run the full timeout
* if given, otherwise assume it'll run at the specified rate.
*/
- if (td->o.timeout)
+ if (td->o.timeout) {
t_eta = td->o.timeout + td->o.start_delay;
+
+ if (in_ramp_time(td)) {
+ unsigned long ramp_left;
+
+ ramp_left = mtime_since_now(&td->start);
+ ramp_left = (ramp_left + 999) / 1000;
+ if (ramp_left <= t_eta)
+ t_eta -= ramp_left;
+ }
+ }
if (td->o.rate) {
r_eta = (bytes_total / 1024) / td->o.rate;
r_eta += td->o.start_delay;
prev_io_bytes[1] = io_bytes[1];
}
+static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
+ unsigned long long *prev_io_iops, unsigned int *iops)
+{
+ iops[0] = ((io_iops[0] - prev_io_iops[0]) * 1000) / mtime;
+ iops[1] = ((io_iops[1] - prev_io_iops[1]) * 1000) / mtime;
+ prev_io_iops[0] = io_iops[0];
+ prev_io_iops[1] = io_iops[1];
+}
+
/*
* Print status of the jobs we know about. This includes rate estimates,
* ETA, thread state, etc.
*/
void print_thread_status(void)
{
- unsigned long elapsed = mtime_since_genesis() / 1000;
- int i, nr_running, nr_pending, t_rate, m_rate;
+ unsigned long elapsed = (mtime_since_genesis() + 999) / 1000;
+ int i, nr_ramp, nr_running, nr_pending, t_rate, m_rate;
int t_iops, m_iops, files_open;
struct thread_data *td;
char eta_str[128];
double perc = 0.0;
- unsigned long long io_bytes[2];
+ unsigned long long io_bytes[2], io_iops[2];
unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
struct timeval now;
static unsigned long long rate_io_bytes[2];
static unsigned long long disp_io_bytes[2];
+ static unsigned long long disp_io_iops[2];
static struct timeval rate_prev_time, disp_prev_time;
- static unsigned int rate[2];
+ static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
memset(eta_secs, 0, thread_number * sizeof(unsigned long));
io_bytes[0] = io_bytes[1] = 0;
+ io_iops[0] = io_iops[1] = 0;
nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
+ nr_ramp = 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;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
- || td->runstate == TD_FSYNCING) {
+ || td->runstate == TD_FSYNCING
+ || td->runstate == TD_PRE_READING) {
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_RAMP) {
+ nr_running++;
+ nr_ramp++;
} else if (td->runstate < TD_RUNNING)
nr_pending++;
if (elapsed >= 3)
- eta_secs[i] = thread_eta(td, elapsed);
+ eta_secs[i] = thread_eta(td);
else
eta_secs[i] = INT_MAX;
check_str_update(td);
- io_bytes[0] += td->io_bytes[0];
- io_bytes[1] += td->io_bytes[1];
+
+ if (td->runstate > TD_RAMP) {
+ io_bytes[0] += td->io_bytes[0];
+ io_bytes[1] += td->io_bytes[1];
+ io_iops[0] += td->io_blocks[0];
+ io_iops[1] += td->io_blocks[1];
+ }
}
if (exitall_on_terminate)
eta_sec = 0;
for_each_td(td, i) {
- if (eta_secs[i] != INT_MAX)
- eta_sec += eta_secs[i];
+ if (exitall_on_terminate) {
+ if (eta_secs[i] < eta_sec)
+ eta_sec = eta_secs[i];
+ } else {
+ if (eta_secs[i] > eta_sec)
+ eta_sec = eta_secs[i];
+ }
}
free(eta_secs);
fio_gettime(&now, NULL);
rate_time = mtime_since(&rate_prev_time, &now);
- if (write_bw_log && rate_time > bw_avg_time) {
+ if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) {
calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
memcpy(&rate_prev_time, &now, sizeof(now));
- add_agg_sample(rate[DDIR_READ], DDIR_READ);
- add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE);
+ add_agg_sample(rate[DDIR_READ], DDIR_READ, 0);
+ add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE, 0);
}
disp_time = mtime_since(&disp_prev_time, &now);
return;
calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+ calc_iops(disp_time, io_iops, disp_io_iops, iops);
+
memcpy(&disp_prev_time, &now, sizeof(now));
if (!nr_running && !nr_pending)
printf(", CR=%d/%d IOPS", t_iops, m_iops);
if (eta_sec != INT_MAX && nr_running) {
char perc_str[32];
- int ll;
+ char *iops_str[2];
+ int l;
- if (!eta_sec && !eta_good)
+ if ((!eta_sec && !eta_good) || nr_ramp == nr_running)
strcpy(perc_str, "-.-% done");
else {
eta_good = 1;
sprintf(perc_str, "%3.1f%% done", perc);
}
- ll = printf(": [%s] [%s] [%6u/%6u kb/s] [eta %s]",
- run_str, perc_str, rate[0], rate[1], eta_str);
- if (ll >= 0 && ll < linelen_last)
- printf("%*s", linelen_last - ll, "");
- linelen_last = ll;
+ iops_str[0] = num2str(iops[0], 4, 1, 0);
+ iops_str[1] = num2str(iops[1], 4, 1, 0);
+
+ l = printf(": [%s] [%s] [%6u/%6u kb/s] [%s/%s iops] [eta %s]",
+ run_str, perc_str, rate[0], rate[1],
+ iops_str[0], iops_str[1], eta_str);
+ if (l >= 0 && l < linelen_last)
+ printf("%*s", linelen_last - l, "");
+ linelen_last = l;
+ free(iops_str[0]);
+ free(iops_str[1]);
}
printf("\r");
fflush(stdout);
projects / fio.git / blobdiff