server: fix typos in conversion

[fio.git] / client.c

diff --git a/client.c b/client.c
index cb2293123acb9c27c93ef5f31d30e56a0c782fc6..4d44b1030961f4ded9d13a018d4f512b2d939edc 100644 (file)
--- a/client.c
+++ b/client.c
@@ -118,12 +118,46 @@ static int fio_client_connect(struct fio_client *client)
        return 0;
 }
 
+void fio_clients_terminate(void)
+{
+       struct flist_head *entry;
+       struct fio_client *client;
+
+       flist_for_each(entry, &client_list) {
+               client = flist_entry(entry, struct fio_client, list);
+
+               fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_QUIT, 0);
+       }
+}
+
+static void sig_int(int sig)
+{
+       fio_clients_terminate();
+}
+
+static void client_signal_handler(void)
+{
+       struct sigaction act;
+
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = sig_int;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGINT, &act, NULL);
+
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = sig_int;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGTERM, &act, NULL);
+}
+
 int fio_clients_connect(void)
 {
        struct fio_client *client;
        struct flist_head *entry, *tmp;
        int ret;
 
+       client_signal_handler();
+
        flist_for_each_safe(entry, tmp, &client_list) {
                client = flist_entry(entry, struct fio_client, list);
 
@@ -208,8 +242,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)
@@ -253,7 +287,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
 
        for (i = 0; i < 3; i++) {
                dst->total_io_u[i]      = le64_to_cpu(src->total_io_u[i]);
-               dst->short_io_u[i]      = le64_to_cpu(src->total_io_u[i]);
+               dst->short_io_u[i]      = le64_to_cpu(src->short_io_u[i]);
        }
 
        dst->total_submit       = le64_to_cpu(src->total_submit);
@@ -267,8 +301,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,9 +340,35 @@ 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;
+       int done = 0;
 
        while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
                dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
@@ -321,6 +381,7 @@ static int handle_client(struct fio_client *client)
                case FIO_NET_CMD_QUIT:
                        remove_client(client);
                        free(cmd);
+                       done = 1;
                        break;
                case FIO_NET_CMD_TEXT:
                        fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
@@ -335,11 +396,18 @@ 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);
                        break;
                }
+
+               if (done)
+                       break;
        }
 
        return 0;