t_eta = __timeout + start_delay + ramp_time;
t_eta /= 1000000ULL;
- if (in_ramp_time(td)) {
+ if ((td->runstate == TD_RAMP) && in_ramp_time(td)) {
unsigned long ramp_left;
ramp_left = mtime_since_now(&td->epoch);
static struct timeval rate_prev_time, disp_prev_time;
if (!force) {
- if (output_format != FIO_OUTPUT_NORMAL &&
+ if (!(output_format & FIO_OUTPUT_NORMAL) &&
f_out == stdout)
return 0;
if (temp_stall_ts || eta_print == FIO_ETA_NEVER)
}
}
- if (exitall_on_terminate)
+ if (exitall_on_terminate) {
je->eta_sec = INT_MAX;
- else
- je->eta_sec = 0;
-
- for_each_td(td, i) {
- if (exitall_on_terminate) {
+ for_each_td(td, i) {
if (eta_secs[i] < je->eta_sec)
je->eta_sec = eta_secs[i];
- } else {
- if (eta_secs[i] > je->eta_sec)
- je->eta_sec = eta_secs[i];
}
+ } else {
+ unsigned long eta_stone = 0;
+
+ je->eta_sec = 0;
+ for_each_td(td, i) {
+ if ((td->runstate == TD_NOT_CREATED) && td->o.stonewall)
+ eta_stone += eta_secs[i];
+ else {
+ if (eta_secs[i] > je->eta_sec)
+ je->eta_sec = eta_secs[i];
+ }
+ }
+ je->eta_sec += eta_stone;
}
free(eta_secs);
fflush(stdout);
}
-struct jobs_eta *get_jobs_eta(int force, size_t *size)
+struct jobs_eta *get_jobs_eta(bool force, size_t *size)
{
struct jobs_eta *je;
if (!thread_number)
return NULL;
- *size = sizeof(*je) + THREAD_RUNSTR_SZ + 1;
+ *size = sizeof(*je) + THREAD_RUNSTR_SZ + 8;
je = malloc(*size);
if (!je)
return NULL;
struct jobs_eta *je;
size_t size;
- je = get_jobs_eta(0, &size);
+ je = get_jobs_eta(false, &size);
if (je)
display_thread_status(je);