From: Jens Axboe <axboe@fb.com>
Date: Mon, 13 Oct 2014 17:33:27 +0000 (-0600)
Subject: client: partial revert of 9899aff3e345
X-Git-Tag: fio-2.1.14~63
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a89d5319371a3907df7eb4fa13cef899b09ec374;p=fio.git

client: partial revert of 9899aff3e345

We do need the client->nr_stat, otherwise things break when
group reporting is not used. We need it to keep track of
how many thread_stat's we are expecting to receive from
each client.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/client.c b/client.c
index 7fdae2ba..928f7d38 100644
--- a/client.c
+++ b/client.c
@@ -1154,8 +1154,9 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
 
 	client->state = Client_started;
 	client->jobs = le32_to_cpu(pdu->jobs);
+	client->nr_stat = le32_to_cpu(pdu->stat_outputs);
 
-	sum_stat_clients++;
+	sum_stat_clients += client->nr_stat;
 }
 
 static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
diff --git a/client.h b/client.h
index 5be84b60..d632f468 100644
--- a/client.h
+++ b/client.h
@@ -47,6 +47,7 @@ struct fio_client {
 	int is_sock;
 	int disk_stats_shown;
 	unsigned int jobs;
+	unsigned int nr_stat;
 	int error;
 	int signal;
 	int ipv6;