X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=b07ae8062dbbfbd7a02a5ffd96dec0ec561021cb;hb=1b79a070d9307ad57cea5922292241bd3851a039;hp=2c15b24e812ab580e32c8f2ca58808a374835d83;hpb=b75a394fd0e9455ab71912d4462aaae7e6e4366b;p=fio.git diff --git a/eta.c b/eta.c index 2c15b24e..b07ae806 100644 --- a/eta.c +++ b/eta.c @@ -83,7 +83,7 @@ static void check_str_update(struct thread_data *td) /* * Convert seconds to a printable string. */ -static void eta_to_str(char *str, unsigned long eta_sec) +void eta_to_str(char *str, unsigned long eta_sec) { unsigned int d, h, m, s; int disp_hour = 0; @@ -230,7 +230,7 @@ static void calc_iops(unsigned long mtime, unsigned long long *io_iops, * Print status of the jobs we know about. This includes rate estimates, * ETA, thread state, etc. */ -int calc_thread_status(struct jobs_eta *je) +int calc_thread_status(struct jobs_eta *je, int force) { struct thread_data *td; int i; @@ -245,11 +245,13 @@ int calc_thread_status(struct jobs_eta *je) static struct timeval rate_prev_time, disp_prev_time; int i2p = 0; - if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER) - return 0; + if (!force) { + if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER) + return 0; - if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS)) - return 0; + if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS)) + return 0; + } if (!rate_io_bytes[0] && !rate_io_bytes[1]) fill_start_time(&rate_prev_time); @@ -271,11 +273,14 @@ int calc_thread_status(struct jobs_eta *je) || td->runstate == TD_FSYNCING || td->runstate == TD_PRE_READING) { je->nr_running++; - je->t_rate += td->o.rate[0] + td->o.rate[1]; - je->m_rate += td->o.ratemin[0] + td->o.ratemin[1]; - je->t_iops += td->o.rate_iops[0] + td->o.rate_iops[1]; - je->m_iops += td->o.rate_iops_min[0] + - td->o.rate_iops_min[1]; + je->t_rate[0] += td->o.rate[0]; + je->t_rate[1] += td->o.rate[1]; + je->m_rate[0] += td->o.ratemin[0]; + je->m_rate[1] += td->o.ratemin[1]; + je->t_iops[0] += td->o.rate_iops[0]; + je->t_iops[1] += td->o.rate_iops[1]; + je->m_iops[0] += td->o.rate_iops_min[0]; + je->m_iops[1] += td->o.rate_iops_min[1]; je->files_open += td->nr_open_files; } else if (td->runstate == TD_RAMP) { je->nr_running++; @@ -332,7 +337,7 @@ int calc_thread_status(struct jobs_eta *je) /* * Allow a little slack, the target is to print it every 1000 msecs */ - if (disp_time < 900) + if (!force && disp_time < 900) return 0; calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate); @@ -340,15 +345,17 @@ int calc_thread_status(struct jobs_eta *je) memcpy(&disp_prev_time, &now, sizeof(now)); - if (!je->nr_running && !je->nr_pending) + if (!force && !je->nr_running && !je->nr_pending) return 0; + je->nr_threads = thread_number; + memcpy(je->run_str, run_str, thread_number * sizeof(char)); + return 1; } -void print_thread_status(void) +void display_thread_status(struct jobs_eta *je) { - struct jobs_eta je; static int linelen_last; static int eta_good; char output[512], *p = output; @@ -356,34 +363,32 @@ void print_thread_status(void) double perc = 0.0; int i2p = 0; - memset(&je, 0, sizeof(je)); - - if (!calc_thread_status(&je)) - return; - - if (je.eta_sec != INT_MAX && je.elapsed_sec) { - perc = (double) je.elapsed_sec / (double) (je.elapsed_sec + je.eta_sec); - eta_to_str(eta_str, je.eta_sec); + if (je->eta_sec != INT_MAX && je->elapsed_sec) { + perc = (double) je->elapsed_sec / (double) (je->elapsed_sec + je->eta_sec); + eta_to_str(eta_str, je->eta_sec); } - p += sprintf(p, "Jobs: %d (f=%d)", je.nr_running, je.files_open); - if (je.m_rate || je.t_rate) { + 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]) { char *tr, *mr; - mr = num2str(je.m_rate, 4, 0, i2p); - tr = num2str(je.t_rate, 4, 0, i2p); + mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, i2p); + tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, i2p); p += sprintf(p, ", CR=%s/%s KB/s", tr, mr); free(tr); free(mr); - } else if (je.m_iops || je.t_iops) - p += sprintf(p, ", CR=%d/%d IOPS", je.t_iops, je.m_iops); - if (je.eta_sec != INT_MAX && je.nr_running) { + } 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->t_iops[1]); + } + if (je->eta_sec != INT_MAX && je->nr_running) { char perc_str[32]; char *iops_str[2]; char *rate_str[2]; int l; - if ((!je.eta_sec && !eta_good) || je.nr_ramp == je.nr_running) + if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running) strcpy(perc_str, "-.-% done"); else { eta_good = 1; @@ -391,15 +396,15 @@ void print_thread_status(void) sprintf(perc_str, "%3.1f%% done", perc); } - rate_str[0] = num2str(je.rate[0], 5, 10, i2p); - rate_str[1] = num2str(je.rate[1], 5, 10, i2p); + rate_str[0] = num2str(je->rate[0], 5, 10, i2p); + rate_str[1] = num2str(je->rate[1], 5, 10, i2p); - iops_str[0] = num2str(je.iops[0], 4, 1, 0); - iops_str[1] = num2str(je.iops[1], 4, 1, 0); + iops_str[0] = num2str(je->iops[0], 4, 1, 0); + iops_str[1] = num2str(je->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); + je->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, ""); @@ -412,13 +417,27 @@ void print_thread_status(void) } p += sprintf(p, "\r"); - if (!is_backend) { - printf("%s", output); - fflush(stdout); - } else - fio_server_text_output(output, p - output); + printf("%s", output); + fflush(stdout); } +void print_thread_status(void) +{ + struct jobs_eta *je; + size_t size; + + if (!thread_number) + return; + + size = sizeof(*je) + thread_number * sizeof(char) + 1; + je = malloc(size); + memset(je, 0, size); + + if (calc_thread_status(je, 0)) + display_thread_status(je); + + free(je); +} void print_status_init(int thr_number) {