X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=6017ca3102eb3b5795915a676e1140728b72579c;hb=b29472cbdbce66ad9905b58f04ac5ed9e9be0090;hp=647a1bdd8eed7433c2413fde356844720b45e722;hpb=df0ca15ce2ffac0df3e9dcf4bfe4121333c4aa27;p=fio.git diff --git a/eta.c b/eta.c index 647a1bdd..6017ca31 100644 --- a/eta.c +++ b/eta.c @@ -3,6 +3,7 @@ */ #include #include +#include #ifdef CONFIG_VALGRIND_DEV #include #else @@ -331,7 +332,7 @@ static void calc_rate(int unified_rw_rep, unsigned long mtime, else this_rate = 0; - if (unified_rw_rep) { + if (unified_rw_rep == UNIFIED_MIXED) { rate[i] = 0; rate[0] += this_rate; } else @@ -356,7 +357,7 @@ static void calc_iops(int unified_rw_rep, unsigned long mtime, else this_iops = 0; - if (unified_rw_rep) { + if (unified_rw_rep == UNIFIED_MIXED) { iops[i] = 0; iops[0] += this_iops; } else @@ -383,8 +384,8 @@ bool calc_thread_status(struct jobs_eta *je, int force) struct thread_data *td; int i, unified_rw_rep; 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]; + unsigned long long io_bytes[DDIR_RWDIR_CNT] = {}; + unsigned long long io_iops[DDIR_RWDIR_CNT] = {}; struct timespec now; static unsigned long long rate_io_bytes[DDIR_RWDIR_CNT]; @@ -392,9 +393,6 @@ bool calc_thread_status(struct jobs_eta *je, int force) static unsigned long long disp_io_iops[DDIR_RWDIR_CNT]; static struct timespec rate_prev_time, disp_prev_time; - void *je_rate = (void *) je->rate; - void *je_iops = (void *) je->iops; - if (!force) { if (!(output_format & FIO_OUTPUT_NORMAL) && f_out == stdout) @@ -416,8 +414,6 @@ bool calc_thread_status(struct jobs_eta *je, int force) je->elapsed_sec = (mtime_since_genesis() + 999) / 1000; - io_bytes[DDIR_READ] = io_bytes[DDIR_WRITE] = io_bytes[DDIR_TRIM] = 0; - io_iops[DDIR_READ] = io_iops[DDIR_WRITE] = io_iops[DDIR_TRIM] = 0; bw_avg_time = ULONG_MAX; unified_rw_rep = 0; for_each_td(td, i) { @@ -425,6 +421,7 @@ bool calc_thread_status(struct jobs_eta *je, int force) if (is_power_of_2(td->o.kb_base)) je->is_pow2 = 1; je->unit_base = td->o.unit_base; + je->sig_figs = td->o.sig_figs; 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 @@ -510,11 +507,12 @@ bool calc_thread_status(struct jobs_eta *je, int force) if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) { calc_rate(unified_rw_rep, rate_time, io_bytes, rate_io_bytes, - je_rate); + je->rate); memcpy(&rate_prev_time, &now, sizeof(now)); - add_agg_sample(sample_val(je->rate[DDIR_READ]), DDIR_READ, 0); - add_agg_sample(sample_val(je->rate[DDIR_WRITE]), DDIR_WRITE, 0); - add_agg_sample(sample_val(je->rate[DDIR_TRIM]), DDIR_TRIM, 0); + regrow_agg_logs(); + for_each_rw_ddir(ddir) { + add_agg_sample(sample_val(je->rate[ddir]), ddir, 0); + } } disp_time = mtime_since(&disp_prev_time, &now); @@ -522,8 +520,8 @@ bool calc_thread_status(struct jobs_eta *je, int force) if (!force && !eta_time_within_slack(disp_time)) return false; - calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je_rate); - calc_iops(unified_rw_rep, disp_time, io_iops, disp_io_iops, je_iops); + calc_rate(unified_rw_rep, disp_time, io_bytes, disp_io_bytes, je->rate); + calc_iops(unified_rw_rep, disp_time, io_iops, disp_io_iops, je->iops); memcpy(&disp_prev_time, &now, sizeof(now)); @@ -539,56 +537,38 @@ bool calc_thread_status(struct jobs_eta *je, int force) 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]; + static const char c[DDIR_RWDIR_CNT] = {'r', 'w', 't'}; + bool has[DDIR_RWDIR_CNT]; + bool has_any = false; + const char *sep; int l = 0; - if (!has_r && !has_w && !has_t) + for_each_rw_ddir(ddir) { + has[ddir] = (je->rate[ddir] || je->iops[ddir]); + has_any |= has[ddir]; + } + if (!has_any) 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]"); + l += snprintf(p + l, left - l, "["); + sep = ""; + for_each_rw_ddir(ddir) { + if (has[ddir]) { + l += snprintf(p + l, left - l, "%s%c=%s", + sep, c[ddir], rate_str[ddir]); + sep = ","; + } } - 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]); + l += snprintf(p + l, left - l, "]["); + sep = ""; + for_each_rw_ddir(ddir) { + if (has[ddir]) { + l += snprintf(p + l, left - l, "%s%c=%s", + sep, c[ddir], iops_str[ddir]); + sep = ","; + } } + l += snprintf(p + l, left - l, " IOPS]"); return l; } @@ -622,9 +602,9 @@ void display_thread_status(struct jobs_eta *je) char *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); + je->sig_figs, 1, 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); + je->sig_figs, 1, je->is_pow2, N2S_BYTEPERSEC); p += sprintf(p, ", %s-%s", mr, tr); free(tr); @@ -728,14 +708,18 @@ void print_thread_status(void) size_t size; je = get_jobs_eta(false, &size); - if (je) + if (je) { display_thread_status(je); - - free(je); + free(je); + } } void print_status_init(int thr_number) { + struct jobs_eta_packed jep; + + compiletime_assert(sizeof(struct jobs_eta) == sizeof(jep), "jobs_eta"); + DRD_IGNORE_VAR(__run_str); __run_str[thr_number] = 'P'; update_condensed_str(__run_str, run_str);