client: handle connection failure

[fio.git] / client.c

diff --git a/client.c b/client.c
index d81f755a03a9276bf0cb51ec26d5fabeb80b0b0a..89c2b442ec9754b6f19c769ba6d3e8d716332bbc 100644 (file)
--- a/client.c
+++ b/client.c
@@ -111,6 +111,7 @@ static int fio_client_connect(struct fio_client *client)
 
        if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
                log_err("fio: connect: %s\n", strerror(errno));
+               log_err("fio: failed to connect to %s\n", client->hostname);
                return 1;
        }
 
@@ -118,12 +119,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);
 
@@ -253,7 +288,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);