server: add ETA as a specific command

[fio.git] / client.c

diff --git a/client.c b/client.c
index 459c300b18fe73b77dfc1f5f912647e46c949915..d81f755a03a9276bf0cb51ec26d5fabeb80b0b0a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -208,8 +208,8 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
        dst->min_val    = le64_to_cpu(src->min_val);
        dst->samples    = le64_to_cpu(src->samples);
        /* FIXME */
-       dst->mean       = le64_to_cpu(src->mean);
-       dst->S          = le64_to_cpu(src->S);
+       dst->mean       = __le64_to_cpu(src->mean);
+       dst->S          = __le64_to_cpu(src->S);
 }
 
 static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
@@ -267,8 +267,8 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
        dst->total_run_time     = le64_to_cpu(src->total_run_time);
        dst->continue_on_error  = le16_to_cpu(src->continue_on_error);
        dst->total_err_count    = le64_to_cpu(src->total_err_count);
-       dst->first_error        = le64_to_cpu(src->first_error);
-       dst->kb_base            = le64_to_cpu(src->kb_base);
+       dst->first_error        = le32_to_cpu(src->first_error);
+       dst->kb_base            = le32_to_cpu(src->kb_base);
 }
 
 static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
@@ -306,6 +306,31 @@ static void handle_gs(struct fio_net_cmd *cmd)
        show_group_stats(gs);
 }
 
+static void handle_eta(struct fio_net_cmd *cmd)
+{
+       struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
+       int i;
+
+       je->nr_running          = le32_to_cpu(je->nr_running);
+       je->nr_ramp             = le32_to_cpu(je->nr_ramp);
+       je->nr_pending          = le32_to_cpu(je->nr_pending);
+       je->files_open          = le32_to_cpu(je->files_open);
+       je->m_rate              = le32_to_cpu(je->m_rate);
+       je->t_rate              = le32_to_cpu(je->t_rate);
+       je->m_iops              = le32_to_cpu(je->m_iops);
+       je->t_iops              = le32_to_cpu(je->t_iops);
+
+       for (i = 0; i < 2; i++) {
+               je->rate[i]     = le32_to_cpu(je->rate[i]);
+               je->iops[i]     = le32_to_cpu(je->iops[i]);
+       }
+
+       je->elapsed_sec         = le32_to_cpu(je->nr_running);
+       je->eta_sec             = le64_to_cpu(je->eta_sec);
+
+       display_thread_status(je);
+}
+
 static int handle_client(struct fio_client *client)
 {
        struct fio_net_cmd *cmd;
@@ -337,6 +362,10 @@ static int handle_client(struct fio_client *client)
                        handle_gs(cmd);
                        free(cmd);
                        break;
+               case FIO_NET_CMD_ETA:
+                       handle_eta(cmd);
+                       free(cmd);
+                       break;
                default:
                        log_err("fio: unknown client op: %d\n", cmd->opcode);
                        free(cmd);