client: dec sum_stat_clients if one a client is disconnected

[fio.git] / client.c

diff --git a/client.c b/client.c
index 130aeafc1a493efc8d3c92f63049200b9724a177..31b4862775eb159775d2fa784a28a9032cc600f6 100644 (file)
--- a/client.c
+++ b/client.c
@@ -66,6 +66,11 @@ static FLIST_HEAD(eta_list);
 
 static FLIST_HEAD(arg_list);
 
+static struct thread_stat client_ts;
+static struct group_run_stats client_gs;
+static int sum_stat_clients;
+static int sum_stat_nr;
+
 #define FIO_CLIENT_HASH_BITS   7
 #define FIO_CLIENT_HASH_SZ     (1 << FIO_CLIENT_HASH_BITS)
 #define FIO_CLIENT_HASH_MASK   (FIO_CLIENT_HASH_SZ - 1)
@@ -132,6 +137,7 @@ static void remove_client(struct fio_client *client)
 
        free(client);
        nr_clients--;
+       sum_stat_clients--;
 }
 
 static void __fio_client_add_cmd_option(struct fio_client *client,
@@ -571,6 +577,20 @@ static void handle_ts(struct fio_net_cmd *cmd)
        convert_gs(&p->rs, &p->rs);
 
        show_thread_status(&p->ts, &p->rs);
+
+       if (sum_stat_clients == 1)
+               return;
+
+       sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
+       sum_group_stats(&client_gs, &p->rs);
+
+       client_ts.members++;
+       client_ts.groupid = p->ts.groupid;
+
+       if (++sum_stat_nr == sum_stat_clients) {
+               strcpy(client_ts.name, "All clients");
+               show_thread_status(&client_ts, &client_gs);
+       }
 }
 
 static void handle_gs(struct fio_net_cmd *cmd)
@@ -859,6 +879,10 @@ int fio_handle_clients(void)
 
        pfds = malloc(nr_clients * sizeof(struct pollfd));
 
+       sum_stat_clients = nr_clients;
+       init_thread_stat(&client_ts);
+       init_group_run_stat(&client_gs);
+
        while (!exit_backend && nr_clients) {
                i = 0;
                flist_for_each(entry, &client_list) {