X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=155eb72070038347e2857c26f71437aaa7f741b1;hp=9cbbcf66734877dd79d32fa284e2d7d3f4bb7a3d;hb=bd33a2f5f6b20e6e7eddc6e1e896c4f12daec9bb;hpb=1e5324e723116a5faf9da686993cc79c14d62d4b diff --git a/client.c b/client.c index 9cbbcf66..155eb720 100644 --- a/client.c +++ b/client.c @@ -14,7 +14,9 @@ #include #include #include +#ifdef CONFIG_ZLIB #include +#endif #include "fio.h" #include "client.h" @@ -296,15 +298,24 @@ int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) static void probe_client(struct fio_client *client) { + struct cmd_client_probe_pdu pdu; + uint64_t tag; + dprint(FD_NET, "client: send probe\n"); - fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0, &client->cmd_list); +#ifdef CONFIG_ZLIB + pdu.flags = __le64_to_cpu(FIO_PROBE_FLAG_ZLIB); +#else + pdu.flags = 0; +#endif + + fio_net_send_cmd(client->fd, FIO_NET_CMD_PROBE, &pdu, sizeof(pdu), &tag, &client->cmd_list); } static int fio_client_connect_ip(struct fio_client *client) { struct sockaddr *addr; - fio_socklen_t socklen; + socklen_t socklen; int fd, domain; if (client->ipv6) { @@ -345,7 +356,7 @@ static int fio_client_connect_ip(struct fio_client *client) static int fio_client_connect_sock(struct fio_client *client) { struct sockaddr_un *addr = &client->addr_un; - fio_socklen_t len; + socklen_t len; int fd; memset(addr, 0, sizeof(*addr)); @@ -699,6 +710,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->groupid = le32_to_cpu(src->groupid); dst->pid = le32_to_cpu(src->pid); dst->members = le32_to_cpu(src->members); + dst->unified_rw_rep = le32_to_cpu(src->unified_rw_rep); for (i = 0; i < DDIR_RWDIR_CNT; i++) { convert_io_stat(&dst->clat_stat[i], &src->clat_stat[i]); @@ -736,7 +748,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) for (j = 0; j < FIO_IO_U_PLAT_NR; j++) dst->io_u_plat[i][j] = le32_to_cpu(src->io_u_plat[i][j]); - for (i = 0; i < 3; i++) { + 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]); } @@ -754,6 +766,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->total_err_count = le64_to_cpu(src->total_err_count); 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); } static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) @@ -770,7 +783,9 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) } dst->kb_base = le32_to_cpu(src->kb_base); + dst->unit_base = le32_to_cpu(src->unit_base); dst->groupid = le32_to_cpu(src->groupid); + dst->unified_rw_rep = le32_to_cpu(src->unified_rw_rep); } static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) @@ -789,6 +804,7 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) client_ts.members++; client_ts.thread_number = p->ts.thread_number; client_ts.groupid = p->ts.groupid; + client_ts.unified_rw_rep = p->ts.unified_rw_rep; if (++sum_stat_nr == sum_stat_clients) { strcpy(client_ts.name, "All clients"); @@ -871,6 +887,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->nr_running = le32_to_cpu(je->nr_running); je->nr_ramp = le32_to_cpu(je->nr_ramp); je->nr_pending = le32_to_cpu(je->nr_pending); + je->nr_setting_up = le32_to_cpu(je->nr_setting_up); je->files_open = le32_to_cpu(je->files_open); for (i = 0; i < DDIR_RWDIR_CNT; i++) { @@ -886,6 +903,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->eta_sec = le64_to_cpu(je->eta_sec); je->nr_threads = le32_to_cpu(je->nr_threads); je->is_pow2 = le32_to_cpu(je->is_pow2); + je->unit_base = le32_to_cpu(je->unit_base); } void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) @@ -895,6 +913,7 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) dst->nr_running += je->nr_running; dst->nr_ramp += je->nr_ramp; dst->nr_pending += je->nr_pending; + dst->nr_setting_up += je->nr_setting_up; dst->files_open += je->files_open; for (i = 0; i < DDIR_RWDIR_CNT; i++) { @@ -938,7 +957,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd) } if (!reply) { - log_err("fio: client: unable to find matching tag (%lx)\n", cmd->tag); + log_err("fio: client: unable to find matching tag (%llx)\n", (unsigned long long) cmd->tag); return; } @@ -992,7 +1011,7 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd) static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) { - struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload; + struct cmd_probe_reply_pdu *probe = (struct cmd_probe_reply_pdu *) cmd->payload; const char *os, *arch; char bit[16]; @@ -1005,10 +1024,11 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) os = "unknown"; sprintf(bit, "%d-bit", probe->bpp * 8); + probe->flags = le64_to_cpu(probe->flags); - log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n", + log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s, flags=%lx\n", probe->hostname, probe->bigendian, bit, os, arch, - probe->fio_version); + probe->fio_version, (unsigned long) probe->flags); if (!client->name) client->name = strdup((char *) probe->hostname); @@ -1051,19 +1071,15 @@ static void convert_text(struct fio_net_cmd *cmd) pdu->log_usec = le64_to_cpu(pdu->log_usec); } -/* - * This has been compressed on the server side, since it can be big. - * Uncompress here. - */ -static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) +static struct cmd_iolog_pdu *convert_iolog_gz(struct fio_net_cmd *cmd, + struct cmd_iolog_pdu *pdu) { - struct cmd_iolog_pdu *pdu = (struct cmd_iolog_pdu *) cmd->payload; +#ifdef CONFIG_ZLIB struct cmd_iolog_pdu *ret; - uint32_t nr_samples; - unsigned long total; z_stream stream; + uint32_t nr_samples; + size_t total; void *p; - int i; stream.zalloc = Z_NULL; stream.zfree = Z_NULL; @@ -1081,10 +1097,9 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) total = nr_samples * sizeof(struct io_sample); ret = malloc(total + sizeof(*pdu)); - ret->thread_number = le32_to_cpu(pdu->thread_number); ret->nr_samples = nr_samples; - ret->log_type = le32_to_cpu(pdu->log_type); - strcpy((char *) ret->name, (char *) pdu->name); + + memcpy(ret, pdu, sizeof(*pdu)); p = (void *) ret + sizeof(*pdu); @@ -1106,7 +1121,7 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) log_err("fio: inflate error %d\n", err); free(ret); ret = NULL; - goto out; + goto err; } this_len = this_chunk - stream.avail_out; @@ -1114,6 +1129,46 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) total -= this_len; } +err: + inflateEnd(&stream); + return ret; +#else + return NULL; +#endif +} + +/* + * This has been compressed on the server side, since it can be big. + * Uncompress here. + */ +static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) +{ + struct cmd_iolog_pdu *pdu = (struct cmd_iolog_pdu *) cmd->payload; + struct cmd_iolog_pdu *ret; + int i; + + /* + * Convert if compressed and we support it. If it's not + * compressed, we need not do anything. + */ + if (le32_to_cpu(pdu->compressed)) { +#ifndef CONFIG_ZLIB + log_err("fio: server sent compressed data by mistake\n"); + return NULL; +#endif + ret = convert_iolog_gz(cmd, pdu); + if (!ret) { + log_err("fio: failed decompressing log\n"); + return NULL; + } + } else + ret = pdu; + + ret->thread_number = le32_to_cpu(ret->thread_number); + ret->nr_samples = le32_to_cpu(ret->nr_samples); + ret->log_type = le32_to_cpu(ret->log_type); + ret->compressed = le32_to_cpu(ret->compressed); + for (i = 0; i < ret->nr_samples; i++) { struct io_sample *s = &ret->samples[i]; @@ -1123,8 +1178,6 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) s->bs = le32_to_cpu(s->bs); } -out: - inflateEnd(&stream); return ret; } @@ -1322,7 +1375,7 @@ static int fio_check_clients_timed_out(void) struct timeval tv; int ret = 0; - gettimeofday(&tv, NULL); + fio_gettime(&tv, NULL); flist_for_each_safe(entry, tmp, &client_list) { client = flist_entry(entry, struct fio_client, list); @@ -1350,7 +1403,7 @@ int fio_handle_clients(struct client_ops *ops) struct pollfd *pfds; int i, ret = 0, retval = 0; - gettimeofday(&eta_tv, NULL); + fio_gettime(&eta_tv, NULL); pfds = malloc(nr_clients * sizeof(struct pollfd)); @@ -1384,8 +1437,8 @@ int fio_handle_clients(struct client_ops *ops) do { struct timeval tv; - gettimeofday(&tv, NULL); - if (mtime_since(&eta_tv, &tv) >= ops->eta_msec) { + fio_gettime(&tv, NULL); + if (mtime_since(&eta_tv, &tv) >= 900) { request_client_etas(ops); memcpy(&eta_tv, &tv, sizeof(tv));