X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=dbc85226d90bbe38a5d21443e66c5db2b5ef2387;hb=48fbb46e7c9a2721b3b23898ab9ec79727ab4e9b;hp=87d03c61ab9dae2844bc30be6902777d194e9cd0;hpb=c71233ee4aa050efc8a099df1482238b12f826ef;p=fio.git diff --git a/client.c b/client.c index 87d03c61..dbc85226 100644 --- a/client.c +++ b/client.c @@ -29,6 +29,8 @@ struct fio_client { int port; int fd; + char *name; + int state; int skip_newline; int is_sock; @@ -37,6 +39,9 @@ struct fio_client { char **argv; }; +static struct jobs_eta client_etas; +static int received_etas; + enum { Client_created = 0, Client_connected = 1, @@ -102,37 +107,32 @@ static void remove_client(struct fio_client *client) free(client->hostname); if (client->argv) free(client->argv); + if (client->name) + free(client->name); free(client); nr_clients--; } -static int __fio_client_add_cmd_option(struct fio_client *client, - const char *opt) +static void __fio_client_add_cmd_option(struct fio_client *client, + const char *opt) { int index; - if (client->argc == FIO_NET_CMD_JOBLINE_ARGV) { - log_err("fio: max cmd line number reached.\n"); - log_err("fio: cmd line <%s> has been ignored.\n", opt); - return 1; - } - index = client->argc++; client->argv = realloc(client->argv, sizeof(char *) * client->argc); client->argv[index] = strdup(opt); dprint(FD_NET, "client: add cmd %d: %s\n", index, opt); - return 0; } -int fio_client_add_cmd_option(void *cookie, const char *opt) +void fio_client_add_cmd_option(void *cookie, const char *opt) { struct fio_client *client = cookie; if (!client || !opt) - return 0; + return; - return __fio_client_add_cmd_option(client, opt); + __fio_client_add_cmd_option(client, opt); } int fio_client_add(const char *hostname, void **cookie) @@ -276,17 +276,41 @@ static void probe_client(struct fio_client *client) static int send_client_cmd_line(struct fio_client *client) { - struct cmd_line_pdu *pdu; + struct cmd_single_line_pdu *cslp; + struct cmd_line_pdu *clp; + unsigned long offset; + void *pdu; + size_t mem; int i, ret; dprint(FD_NET, "client: send cmdline %d\n", client->argc); - pdu = malloc(sizeof(*pdu)); - for (i = 0; i < client->argc; i++) - strcpy((char *) pdu->argv[i], client->argv[i]); + /* + * Find out how much mem we need + */ + for (i = 0, mem = 0; i < client->argc; i++) + mem += strlen(client->argv[i]) + 1; - pdu->argc = cpu_to_le16(client->argc); - ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu)); + /* + * We need one cmd_line_pdu, and argc number of cmd_single_line_pdu + */ + mem += sizeof(*clp) + (client->argc * sizeof(*cslp)); + + pdu = malloc(mem); + clp = pdu; + offset = sizeof(*clp); + + for (i = 0; i < client->argc; i++) { + uint16_t arg_len = strlen(client->argv[i]) + 1; + + cslp = pdu + offset; + strcpy((char *) cslp->text, client->argv[i]); + cslp->len = cpu_to_le16(arg_len); + offset += sizeof(*cslp) + arg_len; + } + + clp->lines = cpu_to_le16(client->argc); + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem); free(pdu); return ret; } @@ -503,9 +527,8 @@ static void handle_gs(struct fio_net_cmd *cmd) show_group_stats(gs); } -static void handle_eta(struct fio_net_cmd *cmd) +static void convert_jobs_eta(struct jobs_eta *je) { - struct jobs_eta *je = (struct jobs_eta *) cmd->payload; int i; je->nr_running = le32_to_cpu(je->nr_running); @@ -522,13 +545,54 @@ static void handle_eta(struct fio_net_cmd *cmd) je->iops[i] = le32_to_cpu(je->iops[i]); } - je->elapsed_sec = le32_to_cpu(je->nr_running); + je->elapsed_sec = le64_to_cpu(je->elapsed_sec); je->eta_sec = le64_to_cpu(je->eta_sec); +} - display_thread_status(je); +static void sum_jobs_eta(struct jobs_eta *je) +{ + struct jobs_eta *dst = &client_etas; + int i; + + dst->nr_running += je->nr_running; + dst->nr_ramp += je->nr_ramp; + dst->nr_pending += je->nr_pending; + dst->files_open += je->files_open; + dst->m_rate += je->m_rate; + dst->t_rate += je->t_rate; + dst->m_iops += je->m_iops; + dst->t_iops += je->t_iops; + + for (i = 0; i < 2; i++) { + dst->rate[i] += je->rate[i]; + dst->iops[i] += je->iops[i]; + } + + dst->elapsed_sec += je->elapsed_sec; + + if (je->eta_sec > dst->eta_sec) + dst->eta_sec = je->eta_sec; +} + +static void handle_eta(struct fio_net_cmd *cmd) +{ + struct jobs_eta *je = (struct jobs_eta *) cmd->payload; + + convert_jobs_eta(je); + + if (nr_clients > 1) { + sum_jobs_eta(je); + received_etas++; + if (received_etas == nr_clients) { + received_etas = 0; + display_thread_status(&client_etas); + memset(&client_etas, 0, sizeof(client_etas)); + } + } else + display_thread_status(je); } -static void handle_probe(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; const char *os, *arch; @@ -544,6 +608,9 @@ static void handle_probe(struct fio_net_cmd *cmd) log_info("hostname=%s, be=%u, os=%s, arch=%s, fio=%u.%u.%u\n", probe->hostname, probe->bigendian, os, arch, probe->fio_major, probe->fio_minor, probe->fio_patch); + + if (!client->name) + client->name = strdup((char *) probe->hostname); } static int handle_client(struct fio_client *client) @@ -566,10 +633,13 @@ static int handle_client(struct fio_client *client) break; case FIO_NET_CMD_TEXT: { const char *buf = (const char *) cmd->payload; + const char *name; int fio_unused ret; + name = client->name ? client->name : client->hostname; + if (!client->skip_newline) - fprintf(f_out, "<%s> ", client->hostname); + fprintf(f_out, "<%s> ", name); ret = fwrite(buf, cmd->pdu_len, 1, f_out); fflush(f_out); client->skip_newline = strchr(buf, '\n') == NULL; @@ -589,7 +659,7 @@ static int handle_client(struct fio_client *client) free(cmd); break; case FIO_NET_CMD_PROBE: - handle_probe(cmd); + handle_probe(client, cmd); free(cmd); break; case FIO_NET_CMD_START: