server/client: don't use __ conversion functions if not needed

[fio.git] / client.c

diff --git a/client.c b/client.c
index 5725fd12d87c38b8bef91daafe1afaf96265753d..6b9fdd8dbfb8e784a9205bcd4c7ff99d97ae3ae1 100644 (file)
--- a/client.c
+++ b/client.c
@@ -60,7 +60,6 @@ static int sum_stat_nr;
 static struct json_object *root = NULL;
 static struct json_array *clients_array = NULL;
 static struct json_array *du_array = NULL;
-static int do_output_all_clients;
 
 #define FIO_CLIENT_HASH_BITS   7
 #define FIO_CLIENT_HASH_SZ     (1 << FIO_CLIENT_HASH_BITS)
@@ -150,7 +149,7 @@ void fio_put_client(struct fio_client *client)
                free(client->files);
 
        if (!client->did_stat)
-               sum_stat_clients -= client->nr_stat;
+               sum_stat_clients--;
 
        free(client);
 }
@@ -620,8 +619,9 @@ static int __fio_client_send_remote_ini(struct fio_client *client,
 
        dprint(FD_NET, "send remote ini %s to %s\n", filename, client->hostname);
 
-       p_size = sizeof(*pdu) + strlen(filename);
+       p_size = sizeof(*pdu) + strlen(filename) + 1;
        pdu = malloc(p_size);
+       memset(pdu, 0, p_size);
        pdu->name_len = strlen(filename);
        strcpy((char *) pdu->file, filename);
        pdu->client_type = cpu_to_le16((uint16_t) client->type);
@@ -830,6 +830,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                dst->total_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->drop_io_u[i]       = le64_to_cpu(src->drop_io_u[i]);
        }
 
        dst->total_submit       = le64_to_cpu(src->total_submit);
@@ -893,7 +894,7 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
                json_array_add_value_object(clients_array, tsobj);
        }
 
-       if (!do_output_all_clients)
+       if (sum_stat_clients <= 1)
                return;
 
        sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
@@ -951,7 +952,7 @@ static void convert_agg(struct disk_util_agg *agg)
        agg->io_ticks           = le32_to_cpu(agg->io_ticks);
        agg->time_in_queue      = le32_to_cpu(agg->time_in_queue);
        agg->slavecount         = le32_to_cpu(agg->slavecount);
-       agg->max_util.u.f       = fio_uint64_to_double(__le64_to_cpu(agg->max_util.u.i));
+       agg->max_util.u.f       = fio_uint64_to_double(le64_to_cpu(agg->max_util.u.i));
 }
 
 static void convert_dus(struct disk_util_stat *dus)
@@ -1155,9 +1156,6 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
        client->jobs = le32_to_cpu(pdu->jobs);
        client->nr_stat = le32_to_cpu(pdu->stat_outputs);
 
-       if (sum_stat_clients > 1)
-               do_output_all_clients = 1;
-
        sum_stat_clients += client->nr_stat;
 }