X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=fc0292f3d7ac6c2e9b4ef5da5ecd29397572a274;hp=1e61b7e90c1c55a4c2c3b291fcb5c87ce550018b;hb=3095ffa9747a679e4f655388c782e4b201047fd3;hpb=b0f65863844b4de92d10fefaabde80ea5bc3e5cc diff --git a/eta.c b/eta.c index 1e61b7e9..fc0292f3 100644 --- a/eta.c +++ b/eta.c @@ -7,7 +7,7 @@ #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. @@ -28,10 +28,21 @@ static void check_str_update(struct thread_data *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'; @@ -110,6 +121,13 @@ static int thread_eta(struct thread_data *td) 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. @@ -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.fill_device && td->o.size == -1ULL) - return 0; - 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) { - 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; - 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) { - r_eta = (bytes_total / 1024) / td->o.rate; + if (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; } @@ -200,6 +217,15 @@ static void calc_rate(unsigned long mtime, unsigned long long *io_bytes, 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. @@ -212,16 +238,19 @@ void print_thread_status(void) 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; + char output[512], *p = output; + int i2p = 0; if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER) return; @@ -238,6 +267,7 @@ void print_thread_status(void) 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; @@ -249,10 +279,11 @@ void print_thread_status(void) || 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; + 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]; files_open += td->nr_open_files; } else if (td->runstate == TD_RAMP) { nr_running++; @@ -270,6 +301,8 @@ void print_thread_status(void) 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]; } } @@ -279,6 +312,8 @@ void print_thread_status(void) 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]; @@ -306,23 +341,37 @@ void print_thread_status(void) } 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); + calc_iops(disp_time, io_iops, disp_io_iops, iops); + memcpy(&disp_prev_time, &now, sizeof(now)); if (!nr_running && !nr_pending) return; - printf("Jobs: %d (f=%d)", nr_running, files_open); - 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); + p += sprintf(p, "Jobs: %d (f=%d)", nr_running, files_open); + if (m_rate || t_rate) { + char *tr, *mr; + + mr = num2str(m_rate, 4, 0, i2p); + tr = num2str(t_rate, 4, 0, i2p); + p += sprintf(p, ", CR=%s/%s KB/s", tr, mr); + free(tr); + free(mr); + } else if (m_iops || t_iops) + p += sprintf(p, ", 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]; + char *rate_str[2]; + int l; if ((!eta_sec && !eta_good) || nr_ramp == nr_running) strcpy(perc_str, "-.-% done"); @@ -332,17 +381,35 @@ void print_thread_status(void) 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; + 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 = sprintf(p, ": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]", + run_str, perc_str, rate_str[0], rate_str[1], + iops_str[0], iops_str[1], eta_str); + p += l; + if (l >= 0 && l < linelen_last) + p += sprintf(p, "%*s", linelen_last - l, ""); + linelen_last = l; + + free(rate_str[0]); + free(rate_str[1]); + free(iops_str[0]); + free(iops_str[1]); } - printf("\r"); - fflush(stdout); + p += sprintf(p, "\r"); + + if (!is_backend) { + printf("%s", output); + fflush(stdout); + } else + fio_server_text_output(output, p - output); } -void print_status_init(int thread_number) +void print_status_init(int thr_number) { - run_str[thread_number] = 'P'; + run_str[thr_number] = 'P'; }