X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=af6621dc63d3e0ce7c196e1bd5daa0e747463a7d;hp=1557240ba1737f197f49d726c49439dc4cba86c4;hb=a606a802173272002e37be6475802be8c37481d6;hpb=952b05e00103bf45576e1860cde0626bd42ed52a diff --git a/client.c b/client.c index 1557240b..af6621dc 100644 --- a/client.c +++ b/client.c @@ -238,7 +238,7 @@ struct fio_client *fio_client_add_explicit(struct client_ops *ops, int ipv6; ipv6 = type == Fio_client_ipv6; - if (fio_server_parse_host(hostname, &ipv6, + if (fio_server_parse_host(hostname, ipv6, &client->addr.sin_addr, &client->addr6.sin6_addr)) goto err; @@ -388,7 +388,7 @@ static int fio_client_connect_sock(struct fio_client *client) memset(addr, 0, sizeof(*addr)); addr->sun_family = AF_UNIX; - strcpy(addr->sun_path, client->hostname); + strncpy(addr->sun_path, client->hostname, sizeof(addr->sun_path) - 1); fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd < 0) { @@ -796,6 +796,11 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->first_error = le32_to_cpu(src->first_error); dst->kb_base = le32_to_cpu(src->kb_base); dst->unit_base = le32_to_cpu(src->unit_base); + + dst->latency_depth = le32_to_cpu(src->latency_depth); + dst->latency_target = le64_to_cpu(src->latency_target); + dst->latency_window = le64_to_cpu(src->latency_window); + dst->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(src->latency_percentile.u.i)); } static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) @@ -902,15 +907,15 @@ static void convert_dus(struct disk_util_stat *dus) int i; for (i = 0; i < 2; i++) { - dus->ios[i] = le32_to_cpu(dus->ios[i]); - dus->merges[i] = le32_to_cpu(dus->merges[i]); - dus->sectors[i] = le64_to_cpu(dus->sectors[i]); - dus->ticks[i] = le32_to_cpu(dus->ticks[i]); + dus->s.ios[i] = le32_to_cpu(dus->s.ios[i]); + dus->s.merges[i] = le32_to_cpu(dus->s.merges[i]); + dus->s.sectors[i] = le64_to_cpu(dus->s.sectors[i]); + dus->s.ticks[i] = le32_to_cpu(dus->s.ticks[i]); } - dus->io_ticks = le32_to_cpu(dus->io_ticks); - dus->time_in_queue = le32_to_cpu(dus->time_in_queue); - dus->msec = le64_to_cpu(dus->msec); + dus->s.io_ticks = le32_to_cpu(dus->s.io_ticks); + dus->s.time_in_queue = le32_to_cpu(dus->s.time_in_queue); + dus->s.msec = le64_to_cpu(dus->s.msec); } static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)