client: properly assign client eta in flight

[fio.git] / client.c

diff --git a/client.c b/client.c
index 713194f9284e4c86a06738a7e99e35eefbce6301..097fcc57adfc763afdeb361d16d38dc77d9ad011 100644 (file)
--- a/client.c
+++ b/client.c
@@ -295,17 +295,22 @@ static int send_client_cmd_line(struct fio_client *client)
        struct cmd_single_line_pdu *cslp;
        struct cmd_line_pdu *clp;
        unsigned long offset;
+       unsigned int *lens;
        void *pdu;
        size_t mem;
        int i, ret;
 
        dprint(FD_NET, "client: send cmdline %d\n", client->argc);
 
+       lens = malloc(client->argc * sizeof(unsigned int));
+
        /*
         * Find out how much mem we need
         */
-       for (i = 0, mem = 0; i < client->argc; i++)
-               mem += strlen(client->argv[i]) + 1;
+       for (i = 0, mem = 0; i < client->argc; i++) {
+               lens[i] = strlen(client->argv[i]) + 1;
+               mem += lens[i];
+       }
 
        /*
         * We need one cmd_line_pdu, and argc number of cmd_single_line_pdu
@@ -317,7 +322,7 @@ static int send_client_cmd_line(struct fio_client *client)
        offset = sizeof(*clp);
 
        for (i = 0; i < client->argc; i++) {
-               uint16_t arg_len = strlen(client->argv[i]) + 1;
+               uint16_t arg_len = lens[i];
 
                cslp = pdu + offset;
                strcpy((char *) cslp->text, client->argv[i]);
@@ -325,6 +330,7 @@ static int send_client_cmd_line(struct fio_client *client)
                offset += sizeof(*cslp) + arg_len;
        }
 
+       free(lens);
        clp->lines = cpu_to_le16(client->argc);
        ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, 0);
        free(pdu);
@@ -604,6 +610,9 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
 
        dprint(FD_NET, "client: got eta tag %p, %d\n", eta, eta->pending);
 
+       assert(client->eta_in_flight == eta);
+
+       client->eta_in_flight = NULL;
        flist_del_init(&client->eta_list);
 
        convert_jobs_eta(je);
@@ -719,7 +728,9 @@ static void request_client_etas(void)
                        continue;
                }
 
+               assert(!client->eta_in_flight);
                flist_add_tail(&client->eta_list, &eta_list);
+               client->eta_in_flight = eta;
                fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_SEND_ETA,
                                                (uint64_t) eta);
        }