client/server: track and handle command timeouts

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 2c15b24e812ab580e32c8f2ca58808a374835d83..b7f1fd62cffe88e2bdac92c5d325ec8fbfb25a55 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -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);
@@ -332,7 +334,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 +342,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 +360,29 @@ 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 || je->t_rate) {
                char *tr, *mr;
 
-               mr = num2str(je.m_rate, 4, 0, i2p);
-               tr = num2str(je.t_rate, 4, 0, i2p);
+               mr = num2str(je->m_rate, 4, 0, i2p);
+               tr = num2str(je->t_rate, 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 || 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) {
                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 +390,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 +411,23 @@ 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;
+
+       je = malloc(sizeof(*je) + thread_number * sizeof(char));
+
+       memset(je, 0, sizeof(*je) + thread_number * sizeof(char));
+
+       if (calc_thread_status(je, 0))
+               display_thread_status(je);
+
+       free(je);
+}
 
 void print_status_init(int thr_number)
 {