X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=31028dd840976e4d1137824c1101269351ec7b2a;hp=25eaf1a35fe359dfb79c662e16385f2cd95a67ee;hb=0798ba36674a7a244e8bc10877e322973a5ca938;hpb=d56cbab065c01e1a177bc1b8d85a8f5d78df1548 diff --git a/eta.c b/eta.c index 25eaf1a3..31028dd8 100644 --- a/eta.c +++ b/eta.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" static char run_str[MAX_JOBS + 1]; @@ -26,20 +25,20 @@ static void check_str_update(struct thread_data *td) break; case TD_RUNNING: if (td_rw(td)) { - if (td->sequential) - c = 'M'; - else + if (td_random(td)) c = 'm'; - } else if (td_read(td)) { - if (td->sequential) - c = 'R'; else + c = 'M'; + } else if (td_read(td)) { + if (td_random(td)) c = 'r'; - } else { - if (td->sequential) - c = 'W'; else + c = 'R'; + } else { + if (td_random(td)) c = 'w'; + else + c = 'W'; } break; case TD_VERIFYING: @@ -70,7 +69,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 int always_d, always_h; + int disp_hour = 0; d = h = m = s = 0; @@ -82,14 +81,13 @@ static void eta_to_str(char *str, int eta_sec) eta_sec /= 24; d = eta_sec; - if (d || always_d) { - always_d = 1; + if (d) { + disp_hour = 1; str += sprintf(str, "%02ud:", d); } - if (h || always_h) { - always_h = 1; + + if (h || disp_hour) str += sprintf(str, "%02uh:", h); - } str += sprintf(str, "%02um:", m); str += sprintf(str, "%02us", s); @@ -109,15 +107,15 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed) * 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 (td->verify) { + if (td->o.verify) { if (td_rw(td)) bytes_total = bytes_total * 3 / 2; else bytes_total <<= 1; } - if (td->zone_size && td->zone_skip) - bytes_total /= (td->zone_skip / td->zone_size); + if (td->o.zone_size && td->o.zone_skip) + bytes_total /= (td->o.zone_skip / td->o.zone_size); if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) { double perc; @@ -129,8 +127,8 @@ static int thread_eta(struct thread_data *td, unsigned long 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->o.timeout && eta_sec > (td->o.timeout - elapsed)) + eta_sec = td->o.timeout - elapsed; } else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED || td->runstate == TD_INITIALIZED) { int t_eta = 0, r_eta = 0; @@ -139,11 +137,11 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed) * We can only guess - assume it'll run the full timeout * if given, otherwise assume it'll run at the specified rate. */ - if (td->timeout) - t_eta = td->timeout + td->start_delay - elapsed; - if (td->rate) { - r_eta = (bytes_total / 1024) / td->rate; - r_eta += td->start_delay - elapsed; + if (td->o.timeout) + t_eta = td->o.timeout + td->o.start_delay - elapsed; + if (td->o.rate) { + r_eta = (bytes_total / 1024) / td->o.rate; + r_eta += td->o.start_delay - elapsed; } if (r_eta && t_eta) @@ -164,6 +162,15 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed) return eta_sec; } +static void calc_rate(unsigned long mtime, unsigned long long *io_bytes, + unsigned long long *prev_io_bytes, unsigned int *rate) +{ + rate[0] = (io_bytes[0] - prev_io_bytes[0]) / mtime; + rate[1] = (io_bytes[1] - prev_io_bytes[1]) / mtime; + prev_io_bytes[0] = io_bytes[0]; + prev_io_bytes[1] = io_bytes[1]; +} + /* * Print status of the jobs we know about. This includes rate estimates, * ETA, thread state, etc. @@ -172,33 +179,45 @@ void print_thread_status(void) { unsigned long elapsed = mtime_since_genesis() / 1000; int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec; + int t_iops, m_iops, files_open; struct thread_data *td; - char eta_str[32]; + char eta_str[128]; double perc = 0.0; - - static unsigned long long prev_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 rate_time, disp_time, bw_avg_time; + struct timeval now; + + static unsigned long long rate_io_bytes[2]; + static unsigned long long disp_io_bytes[2]; + static struct timeval rate_prev_time, disp_prev_time; + static unsigned int rate[2]; if (temp_stall_ts || terse_output) return; - if (!prev_io_bytes[0] && !prev_io_bytes[1]) - fill_start_time(&prev_time); + if (!rate_io_bytes[0] && !rate_io_bytes[1]) + fill_start_time(&rate_prev_time); + if (!disp_io_bytes[0] && !disp_io_bytes[1]) + fill_start_time(&disp_prev_time); eta_secs = malloc(thread_number * sizeof(int)); memset(eta_secs, 0, thread_number * sizeof(int)); io_bytes[0] = io_bytes[1] = 0; - nr_pending = nr_running = t_rate = m_rate = 0; + nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0; + bw_avg_time = ULONG_MAX; + files_open = 0; for_each_td(td, i) { - if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING|| - td->runstate == TD_FSYNCING) { + 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) { nr_running++; - t_rate += td->rate; - m_rate += td->ratemin; + 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_RUNNING) nr_pending++; @@ -234,23 +253,34 @@ void print_thread_status(void) eta_to_str(eta_str, eta_sec); } - mtime = mtime_since_now(&prev_time); - if (mtime > 1000) { - r_rate = (io_bytes[0] - prev_io_bytes[0]) / mtime; - w_rate = (io_bytes[1] - prev_io_bytes[1]) / mtime; - fio_gettime(&prev_time, NULL); - memcpy(prev_io_bytes, io_bytes, sizeof(io_bytes)); + fio_gettime(&now, NULL); + rate_time = mtime_since(&rate_prev_time, &now); + + if (write_bw_log && rate_time> bw_avg_time) { + 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); } + disp_time = mtime_since(&disp_prev_time, &now); + if (disp_time < 1000) + return; + + calc_rate(disp_time, io_bytes, disp_io_bytes, rate); + memcpy(&disp_prev_time, &now, sizeof(now)); + if (!nr_running && !nr_pending) return; - printf("Threads: %d", nr_running); + printf("Jobs: %d (f=%d)", nr_running, files_open); if (m_rate || t_rate) - printf(", commitrate %d/%dKiB/sec", t_rate, m_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); if (eta_sec != INT_MAX && nr_running) { perc *= 100.0; - printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, r_rate, w_rate, eta_str); + printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str); } printf("\r"); fflush(stdout);