#include <string.h>
#include "fio.h"
+#include "lib/pow2.h"
-static char run_str[REAL_MAX_JOBS + 1];
+static char __run_str[REAL_MAX_JOBS + 1];
+static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)];
+
+static void update_condensed_str(char *rstr, char *run_str_condensed)
+{
+ if (*rstr) {
+ while (*rstr) {
+ int nr = 1;
+
+ *run_str_condensed++ = *rstr++;
+ while (*(rstr - 1) == *rstr) {
+ rstr++;
+ nr++;
+ }
+ run_str_condensed += sprintf(run_str_condensed, "(%u),", nr);
+ }
+ run_str_condensed--;
+ }
+ *run_str_condensed = '\0';
+}
/*
* Sets the status of the 'td' in the printed status map.
*/
static void check_str_update(struct thread_data *td)
{
- char c = run_str[td->thread_number - 1];
+ char c = __run_str[td->thread_number - 1];
switch (td->runstate) {
case TD_REAPED:
case TD_FSYNCING:
c = 'F';
break;
+ case TD_FINISHING:
+ c = 'f';
+ break;
case TD_CREATED:
c = 'C';
break;
log_err("state %d\n", td->runstate);
}
- run_str[td->thread_number - 1] = c;
+ __run_str[td->thread_number - 1] = c;
+ update_condensed_str(__run_str, run_str);
}
/*
unsigned int d, h, m, s;
int disp_hour = 0;
+ if (eta_sec == -1) {
+ sprintf(str, "--");
+ return;
+ }
+
s = eta_sec % 60;
eta_sec /= 60;
m = eta_sec % 60;
/*
* Best effort calculation of the estimated pending runtime of a job.
*/
-static int thread_eta(struct thread_data *td)
+static unsigned long thread_eta(struct thread_data *td)
{
unsigned long long bytes_total, bytes_done;
unsigned long eta_sec = 0;
unsigned long elapsed;
+ uint64_t timeout;
elapsed = (mtime_since_now(&td->epoch) + 999) / 1000;
+ timeout = td->o.timeout / 1000000UL;
bytes_total = td->total_io_size;
+ if (td->flags & TD_F_NO_PROGRESS)
+ return -1;
+
if (td->o.fill_device && td->o.size == -1ULL) {
if (!td->fill_device_size || td->fill_device_size == -1ULL)
return 0;
double perc, perc_t;
bytes_done = ddir_rw_sum(td->io_bytes);
- perc = (double) bytes_done / (double) bytes_total;
- if (perc > 1.0)
- perc = 1.0;
+
+ if (bytes_total) {
+ perc = (double) bytes_done / (double) bytes_total;
+ if (perc > 1.0)
+ perc = 1.0;
+ } else
+ perc = 0.0;
if (td->o.time_based) {
- perc_t = (double) elapsed / (double) td->o.timeout;
- if (perc_t < perc)
- perc = perc_t;
+ if (timeout) {
+ perc_t = (double) elapsed / (double) timeout;
+ if (perc_t < perc)
+ perc = perc_t;
+ } else {
+ /*
+ * Will never hit, we can't have time_based
+ * without a timeout set.
+ */
+ perc = 0.0;
+ }
}
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
if (td->o.timeout &&
- eta_sec > (td->o.timeout + done_secs - elapsed))
- eta_sec = td->o.timeout + done_secs - elapsed;
+ eta_sec > (timeout + done_secs - elapsed))
+ eta_sec = timeout + done_secs - elapsed;
} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
|| td->runstate == TD_INITIALIZED
+ || td->runstate == TD_SETTING_UP
|| td->runstate == TD_RAMP
|| td->runstate == TD_PRE_READING) {
int t_eta = 0, r_eta = 0;
* if given, otherwise assume it'll run at the specified rate.
*/
if (td->o.timeout) {
- t_eta = td->o.timeout + td->o.start_delay +
- td->o.ramp_time;
+ uint64_t __timeout = td->o.timeout;
+ uint64_t start_delay = td->o.start_delay;
+ uint64_t ramp_time = td->o.ramp_time;
+
+ t_eta = __timeout + start_delay + ramp_time;
+ t_eta /= 1000000ULL;
if (in_ramp_time(td)) {
unsigned long ramp_left;
rate_bytes = ddir_rw_sum(td->o.rate);
if (rate_bytes) {
r_eta = (bytes_total / 1024) / rate_bytes;
- r_eta += td->o.start_delay;
+ r_eta += (td->o.start_delay / 1000000ULL);
}
if (r_eta && t_eta)
int i;
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
- unsigned long long diff;
+ unsigned long long diff, this_rate;
diff = io_bytes[i] - prev_io_bytes[i];
+ if (mtime)
+ this_rate = ((1000 * diff) / mtime) / 1024;
+ else
+ this_rate = 0;
+
if (unified_rw_rep) {
rate[i] = 0;
- rate[0] += ((1000 * diff) / mtime) / 1024;
+ rate[0] += this_rate;
} else
- rate[i] = ((1000 * diff) / mtime) / 1024;
+ rate[i] = this_rate;
prev_io_bytes[i] = io_bytes[i];
}
int i;
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
- unsigned long long diff;
+ unsigned long long diff, this_iops;
diff = io_iops[i] - prev_io_iops[i];
+ if (mtime)
+ this_iops = (diff * 1000) / mtime;
+ else
+ this_iops = 0;
+
if (unified_rw_rep) {
iops[i] = 0;
- iops[0] += (diff * 1000) / mtime;
+ iops[0] += this_iops;
} else
- iops[i] = (diff * 1000) / mtime;
+ iops[i] = this_iops;
prev_io_iops[i] = io_iops[i];
}
unified_rw_rep += td->o.unified_rw_rep;
if (is_power_of_2(td->o.kb_base))
je->is_pow2 = 1;
+ je->unit_base = td->o.unit_base;
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
- || td->runstate == TD_PRE_READING) {
+ || td->runstate == TD_PRE_READING
+ || td->runstate == TD_FINISHING) {
je->nr_running++;
if (td_read(td)) {
je->t_rate[0] += td->o.rate[DDIR_READ];
je->nr_running++;
je->nr_ramp++;
} else if (td->runstate == TD_SETTING_UP)
- je->nr_running++;
+ je->nr_setting_up++;
else if (td->runstate < TD_RUNNING)
je->nr_pending++;
check_str_update(td);
- if (td->runstate > TD_RAMP) {
+ if (td->runstate > TD_SETTING_UP) {
int ddir;
for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
return 0;
je->nr_threads = thread_number;
- memcpy(je->run_str, run_str, thread_number * sizeof(char));
+ update_condensed_str(__run_str, run_str);
+ memcpy(je->run_str, run_str, strlen(run_str));
return 1;
}
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[0] + je->m_rate[1], 4, 0, je->is_pow2);
- tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
+ 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);
free(tr);
free(mr);
int l;
int ddir;
- if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
+ if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running ||
+ je->eta_sec == -1)
strcpy(perc_str, "-.-% done");
else {
+ double mult = 100.0;
+
+ if (je->nr_setting_up && je->nr_running)
+ mult *= (1.0 - (double) je->nr_setting_up / (double) je->nr_running);
+
eta_good = 1;
- perc *= 100.0;
+ perc *= mult;
sprintf(perc_str, "%3.1f%% done", perc);
}
for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
rate_str[ddir] = num2str(je->rate[ddir], 5,
- 1024, je->is_pow2);
- iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0);
+ 1024, je->is_pow2, je->unit_base);
+ iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, 0);
}
left = sizeof(output) - (p - output) - 1;
if (!eta_new_line_init) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_init = 1;
- } else if (eta_new_line &&
- mtime_since_now(&disp_eta_new_line) > eta_new_line * 1000) {
+ } else if (eta_new_line && mtime_since_now(&disp_eta_new_line) > eta_new_line) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_pending = 1;
}
fflush(stdout);
}
-void print_thread_status(void)
+struct jobs_eta *get_jobs_eta(int force, size_t *size)
{
struct jobs_eta *je;
- size_t size;
if (!thread_number)
- return;
+ return NULL;
+
+ *size = sizeof(*je) + THREAD_RUNSTR_SZ;
+ je = malloc(*size);
+ if (!je)
+ return NULL;
+ memset(je, 0, *size);
- size = sizeof(*je) + thread_number * sizeof(char) + 1;
- je = malloc(size);
- memset(je, 0, size);
+ if (!calc_thread_status(je, force)) {
+ free(je);
+ return NULL;
+ }
+
+ *size = sizeof(*je) + strlen((char *) je->run_str) + 1;
+ return je;
+}
+
+void print_thread_status(void)
+{
+ struct jobs_eta *je;
+ size_t size;
- if (calc_thread_status(je, 0))
+ je = get_jobs_eta(0, &size);
+ if (je)
display_thread_status(je);
free(je);
void print_status_init(int thr_number)
{
- run_str[thr_number] = 'P';
+ __run_str[thr_number] = 'P';
+ update_condensed_str(__run_str, run_str);
}
projects / fio.git / blobdiff