genzip: add summed hit percentages

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index baada7bc48ad51604978d7cffc6051115325239e..167bf5f62b215d470e1f41d1ee95ba75968589cd 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -10,15 +10,15 @@
 static char __run_str[REAL_MAX_JOBS + 1];
 static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)];
 
-static void update_condensed_str(char *run_str, char *run_str_condensed)
+static void update_condensed_str(char *rstr, char *run_str_condensed)
 {
-       if (*run_str) {
-               while (*run_str) {
+       if (*rstr) {
+               while (*rstr) {
                        int nr = 1;
 
-                       *run_str_condensed++ = *run_str++;
-                       while (*(run_str - 1) == *run_str) {
-                               run_str++;
+                       *run_str_condensed++ = *rstr++;
+                       while (*(rstr - 1) == *rstr) {
+                               rstr++;
                                nr++;
                        }
                        run_str_condensed += sprintf(run_str_condensed, "(%u),", nr);
@@ -234,11 +234,11 @@ static int thread_eta(struct thread_data *td)
                 * if given, otherwise assume it'll run at the specified rate.
                 */
                if (td->o.timeout) {
-                       uint64_t timeout = td->o.timeout;
+                       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 = __timeout + start_delay + ramp_time;
                        t_eta /= 1000000ULL;
 
                        if (in_ramp_time(td)) {
@@ -555,8 +555,7 @@ void display_thread_status(struct jobs_eta *je)
        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;
        }
@@ -573,9 +572,11 @@ struct jobs_eta *get_jobs_eta(int force, size_t *size)
 
        *size = sizeof(*je) + THREAD_RUNSTR_SZ;
        je = malloc(*size);
+       if (!je)
+               return NULL;
        memset(je, 0, *size);
 
-       if (!calc_thread_status(je, 0)) {
+       if (!calc_thread_status(je, force)) {
                free(je);
                return NULL;
        }