Add create_only option

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 5b912eb7166c81b1cb310e42a5c61701ecb6e9c0..4679a21a1192b0c36f2df0b5016580537cb1f0b8 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -18,7 +18,12 @@ static void check_str_update(struct thread_data *td)
 
        switch (td->runstate) {
        case TD_REAPED:
-               c = '_';
+               if (td->error)
+                       c = 'X';
+               else if (td->sig)
+                       c = 'K';
+               else
+                       c = '_';
                break;
        case TD_EXITED:
                c = 'E';
@@ -230,7 +235,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 +250,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);
@@ -332,7 +339,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,7 +347,7 @@ 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;
@@ -353,7 +360,7 @@ void display_thread_status(struct jobs_eta *je)
 {
        static int linelen_last;
        static int eta_good;
-       char output[512], *p = output;
+       char output[REAL_MAX_JOBS + 512], *p = output;
        char eta_str[128];
        double perc = 0.0;
        int i2p = 0;
@@ -378,6 +385,7 @@ void display_thread_status(struct jobs_eta *je)
                char perc_str[32];
                char *iops_str[2];
                char *rate_str[2];
+               size_t left;
                int l;
 
                if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
@@ -394,7 +402,9 @@ void display_thread_status(struct jobs_eta *je)
                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]",
+               left = sizeof(output) - (p - output) - 1;
+
+               l = snprintf(p, left, ": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
                                je->run_str, perc_str, rate_str[0],
                                rate_str[1], iops_str[0], iops_str[1], eta_str);
                p += l;
@@ -416,12 +426,16 @@ void display_thread_status(struct jobs_eta *je)
 void print_thread_status(void)
 {
        struct jobs_eta *je;
+       size_t size;
 
-       je = malloc(sizeof(*je) + thread_number * sizeof(char));
+       if (!thread_number)
+               return;
 
-       memset(je, 0, sizeof(*je) + thread_number * sizeof(char));
+       size = sizeof(*je) + thread_number * sizeof(char) + 1;
+       je = malloc(size);
+       memset(je, 0, size);
 
-       if (calc_thread_status(je))
+       if (calc_thread_status(je, 0))
                display_thread_status(je);
 
        free(je);