From: Jens Axboe Date: Thu, 8 Mar 2012 11:30:48 +0000 (+0100) Subject: client/server: store/convert/send jobs_eta->nr_threads too X-Git-Tag: gfio-0.1~218 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=8c621fb2aa4b99c8a8b6b62435d713ab39b52c62 client/server: store/convert/send jobs_eta->nr_threads too We still need to handle jobs_eta->run_str[] as well... Signed-off-by: Jens Axboe --- diff --git a/client.c b/client.c index 40e5be2e..3adddc02 100644 --- a/client.c +++ b/client.c @@ -747,6 +747,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->elapsed_sec = le64_to_cpu(je->elapsed_sec); je->eta_sec = le64_to_cpu(je->eta_sec); + je->nr_threads = le32_to_cpu(je->nr_threads); } void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) @@ -771,6 +772,9 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) if (je->eta_sec > dst->eta_sec) dst->eta_sec = je->eta_sec; + + dst->nr_threads += je->nr_threads; + /* we need to handle je->run_str too ... */ } void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn) diff --git a/server.c b/server.c index 9ee75209..c504e872 100644 --- a/server.c +++ b/server.c @@ -465,6 +465,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd) je->elapsed_sec = cpu_to_le64(je->elapsed_sec); je->eta_sec = cpu_to_le64(je->eta_sec); + je->nr_threads = cpu_to_le32(je->nr_threads); fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag); free(je);