X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=970a67dfd0ac8d6672758b99d528f32526f26e4e;hp=19afad5b04293df75201ee00914a862964f78b20;hb=4806b82473fea74c517e5e0c7665b0ca0542b3ec;hpb=af2fde1961fe6847b7f3dbbc74aa46ec09d0e129 diff --git a/eta.c b/eta.c index 19afad5b..970a67df 100644 --- a/eta.c +++ b/eta.c @@ -2,14 +2,18 @@ * Status and ETA code */ #include -#include #include +#ifdef CONFIG_VALGRIND_DEV +#include +#else +#define DRD_IGNORE_VAR(x) do { } while (0) +#endif #include "fio.h" #include "lib/pow2.h" static char __run_str[REAL_MAX_JOBS + 1]; -static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)]; +static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS) + 1]; static void update_condensed_str(char *rstr, char *run_str_condensed) { @@ -145,7 +149,7 @@ void eta_to_str(char *str, unsigned long eta_sec) str += sprintf(str, "%02uh:", h); str += sprintf(str, "%02um:", m); - str += sprintf(str, "%02us", s); + sprintf(str, "%02us", s); } /* @@ -308,7 +312,7 @@ static void calc_rate(int unified_rw_rep, unsigned long mtime, diff = io_bytes[i] - prev_io_bytes[i]; if (mtime) - this_rate = ((1000 * diff) / mtime) / 1024; + this_rate = ((1000 * diff) / mtime) / 1024; /* KiB/s */ else this_rate = 0; @@ -347,6 +351,14 @@ static void calc_iops(int unified_rw_rep, unsigned long mtime, } } +/* + * Allow a little slack - if we're within 95% of the time, allow ETA. + */ +bool eta_time_within_slack(unsigned int time) +{ + return time > ((eta_interval_msec * 95) / 100); +} + /* * Print status of the jobs we know about. This includes rate estimates, * ETA, thread state, etc. @@ -358,12 +370,12 @@ bool calc_thread_status(struct jobs_eta *je, int force) uint64_t rate_time, disp_time, bw_avg_time, *eta_secs; unsigned long long io_bytes[DDIR_RWDIR_CNT]; unsigned long long io_iops[DDIR_RWDIR_CNT]; - struct timeval now; + struct timespec now; static unsigned long long rate_io_bytes[DDIR_RWDIR_CNT]; static unsigned long long disp_io_bytes[DDIR_RWDIR_CNT]; static unsigned long long disp_io_iops[DDIR_RWDIR_CNT]; - static struct timeval rate_prev_time, disp_prev_time; + static struct timespec rate_prev_time, disp_prev_time; if (!force) { if (!(output_format & FIO_OUTPUT_NORMAL) && @@ -440,7 +452,7 @@ bool calc_thread_status(struct jobs_eta *je, int force) if (td->runstate > TD_SETTING_UP) { int ddir; - for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) { + for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { if (unified_rw_rep) { io_bytes[0] += td->io_bytes[ddir]; io_iops[0] += td->io_blocks[ddir]; @@ -489,10 +501,7 @@ bool calc_thread_status(struct jobs_eta *je, int force) disp_time = mtime_since(&disp_prev_time, &now); - /* - * Allow a little slack, the target is to print it every 1000 msecs - */ - if (!force && disp_time < 900) + if (!force && !eta_time_within_slack(disp_time)) return false; calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je->rate); @@ -509,13 +518,70 @@ bool calc_thread_status(struct jobs_eta *je, int force) return true; } +static int gen_eta_str(struct jobs_eta *je, char *p, size_t left, + char **rate_str, char **iops_str) +{ + bool has_r = je->rate[DDIR_READ] || je->iops[DDIR_READ]; + bool has_w = je->rate[DDIR_WRITE] || je->iops[DDIR_WRITE]; + bool has_t = je->rate[DDIR_TRIM] || je->iops[DDIR_TRIM]; + int l = 0; + + if (!has_r && !has_w && !has_t) + return 0; + + if (has_r) { + l += snprintf(p + l, left - l, "[r=%s", rate_str[DDIR_READ]); + if (!has_w) + l += snprintf(p + l, left - l, "]"); + } + if (has_w) { + if (has_r) + l += snprintf(p + l, left - l, ","); + else + l += snprintf(p + l, left - l, "["); + l += snprintf(p + l, left - l, "w=%s", rate_str[DDIR_WRITE]); + if (!has_t) + l += snprintf(p + l, left - l, "]"); + } + if (has_t) { + if (has_r || has_w) + l += snprintf(p + l, left - l, ","); + else if (!has_r && !has_w) + l += snprintf(p + l, left - l, "["); + l += snprintf(p + l, left - l, "t=%s]", rate_str[DDIR_TRIM]); + } + if (has_r) { + l += snprintf(p + l, left - l, "[r=%s", iops_str[DDIR_READ]); + if (!has_w) + l += snprintf(p + l, left - l, " IOPS]"); + } + if (has_w) { + if (has_r) + l += snprintf(p + l, left - l, ","); + else + l += snprintf(p + l, left - l, "["); + l += snprintf(p + l, left - l, "w=%s", iops_str[DDIR_WRITE]); + if (!has_t) + l += snprintf(p + l, left - l, " IOPS]"); + } + if (has_t) { + if (has_r || has_w) + l += snprintf(p + l, left - l, ","); + else if (!has_r && !has_w) + l += snprintf(p + l, left - l, "["); + l += snprintf(p + l, left - l, "t=%s IOPS]", iops_str[DDIR_TRIM]); + } + + return l; +} + void display_thread_status(struct jobs_eta *je) { - static struct timeval disp_eta_new_line; + static struct timespec disp_eta_new_line; static int eta_new_line_init, eta_new_line_pending; static int linelen_last; static int eta_good; - char output[REAL_MAX_JOBS + 512], *p = output; + char output[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS) + 512], *p = output; char eta_str[128]; double perc = 0.0; @@ -526,23 +592,33 @@ void display_thread_status(struct jobs_eta *je) if (eta_new_line_pending) { eta_new_line_pending = 0; + linelen_last = 0; p += sprintf(p, "\n"); } p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open); - if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) { + + /* rate limits, if any */ + if (je->m_rate[0] || je->m_rate[1] || je->m_rate[2] || + je->t_rate[0] || je->t_rate[1] || je->t_rate[2]) { char *tr, *mr; - mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2, 8); - tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2, 8); - p += sprintf(p, ", CR=%s/%s KB/s", tr, mr); + mr = num2str(je->m_rate[0] + je->m_rate[1] + je->m_rate[2], + je->sig_figs, 0, je->is_pow2, N2S_BYTEPERSEC); + tr = num2str(je->t_rate[0] + je->t_rate[1] + je->t_rate[2], + je->sig_figs, 0, je->is_pow2, N2S_BYTEPERSEC); + + p += sprintf(p, ", %s-%s", mr, tr); free(tr); free(mr); - } else if (je->m_iops[0] || je->m_iops[1] || je->t_iops[0] || je->t_iops[1]) { - p += sprintf(p, ", CR=%d/%d IOPS", - je->t_iops[0] + je->t_iops[1], - je->m_iops[0] + je->m_iops[1]); + } else if (je->m_iops[0] || je->m_iops[1] || je->m_iops[2] || + je->t_iops[0] || je->t_iops[1] || je->t_iops[2]) { + p += sprintf(p, ", %d-%d IOPS", + je->m_iops[0] + je->m_iops[1] + je->m_iops[2], + je->t_iops[0] + je->t_iops[1] + je->t_iops[2]); } + + /* current run string, % done, bandwidth, iops, eta */ if (je->eta_sec != INT_MAX && je->nr_running) { char perc_str[32]; char *iops_str[DDIR_RWDIR_CNT]; @@ -550,10 +626,11 @@ void display_thread_status(struct jobs_eta *je) size_t left; int l; int ddir; + int linelen; if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running || je->eta_sec == -1) - strcpy(perc_str, "-.-% done"); + strcpy(perc_str, "-.-%"); else { double mult = 100.0; @@ -562,33 +639,35 @@ void display_thread_status(struct jobs_eta *je) eta_good = 1; perc *= mult; - sprintf(perc_str, "%3.1f%% done", perc); + sprintf(perc_str, "%3.1f%%", perc); } - for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) { - rate_str[ddir] = num2str(je->rate[ddir], 5, + for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { + rate_str[ddir] = num2str(je->rate[ddir], 4, 1024, je->is_pow2, je->unit_base); - iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, 0); + iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, N2S_NONE); } left = sizeof(output) - (p - output) - 1; + l = snprintf(p, left, ": [%s][%s]", je->run_str, perc_str); + l += gen_eta_str(je, p + l, left - l, rate_str, iops_str); + l += snprintf(p + l, left - l, "[eta %s]", eta_str); - l = snprintf(p, left, ": [%s] [%s] [%s/%s/%s /s] [%s/%s/%s iops] [eta %s]", - je->run_str, perc_str, rate_str[DDIR_READ], - rate_str[DDIR_WRITE], rate_str[DDIR_TRIM], - iops_str[DDIR_READ], iops_str[DDIR_WRITE], - iops_str[DDIR_TRIM], eta_str); + /* If truncation occurred adjust l so p is on the null */ + if (l >= left) + l = left - 1; p += l; - if (l >= 0 && l < linelen_last) - p += sprintf(p, "%*s", linelen_last - l, ""); - linelen_last = l; + linelen = p - output; + if (l >= 0 && linelen < linelen_last) + p += sprintf(p, "%*s", linelen_last - linelen, ""); + linelen_last = linelen; - for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) { + for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { free(rate_str[ddir]); free(iops_str[ddir]); } } - p += sprintf(p, "\r"); + sprintf(p, "\r"); printf("%s", output); @@ -639,6 +718,7 @@ void print_thread_status(void) void print_status_init(int thr_number) { + DRD_IGNORE_VAR(__run_str); __run_str[thr_number] = 'P'; update_condensed_str(__run_str, run_str); }