X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=e109b93fcc86e4db88cdc2edf9d06a745e22f17e;hp=83bbfc40f6050af097253b50113331bfb18092f0;hb=60f6b33079c8ffbd09f448060f58b82ba920b620;hpb=df380934e53c645b4b7cdec882b512b4d20ebc14 diff --git a/client.c b/client.c index 83bbfc40..e109b93f 100644 --- a/client.c +++ b/client.c @@ -16,10 +16,13 @@ #include #include "fio.h" +#include "client.h" #include "server.h" #include "flist.h" #include "hash.h" +extern void (*update_thread_status)(char *status_message, double perc); + struct client_eta { struct jobs_eta eta; unsigned int pending; @@ -29,8 +32,11 @@ struct fio_client { struct flist_head list; struct flist_head hash_list; struct flist_head arg_list; - struct sockaddr_in addr; - struct sockaddr_un addr_un; + union { + struct sockaddr_in addr; + struct sockaddr_in6 addr6; + struct sockaddr_un addr_un; + }; char *hostname; int port; int fd; @@ -41,6 +47,11 @@ struct fio_client { int skip_newline; int is_sock; + int disk_stats_shown; + unsigned int jobs; + int error; + int ipv6; + int sent_job; struct flist_head eta_list; struct client_eta *eta_in_flight; @@ -51,14 +62,46 @@ struct fio_client { char **argv; }; +static void fio_client_text_op(struct fio_client *client, + FILE *f, __u16 pdu_len, const char *buf) +{ + const char *name; + int fio_unused ret; + + name = client->name ? client->name : client->hostname; + + if (!client->skip_newline) + fprintf(f, "<%s> ", name); + ret = fwrite(buf, pdu_len, 1, f); + fflush(f); + client->skip_newline = strchr(buf, '\n') == NULL; +} + +static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd); +static void handle_ts(struct fio_net_cmd *cmd); +static void handle_gs(struct fio_net_cmd *cmd); +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 client_ops fio_client_ops = { + fio_client_text_op, + handle_du, + handle_ts, + handle_gs, + handle_eta, + handle_probe, + NULL, /* status display, if NULL, printf is used */ +}; + static struct timeval eta_tv; enum { Client_created = 0, Client_connected = 1, Client_started = 2, - Client_stopped = 3, - Client_exited = 4, + Client_running = 3, + Client_stopped = 4, + Client_exited = 5, }; static FLIST_HEAD(client_list); @@ -76,7 +119,7 @@ static int sum_stat_nr; #define FIO_CLIENT_HASH_MASK (FIO_CLIENT_HASH_SZ - 1) static struct flist_head client_hash[FIO_CLIENT_HASH_SZ]; -static int handle_client(struct fio_client *client); +static int handle_client(struct fio_client *client, struct client_ops *ops); static void dec_jobs_eta(struct client_eta *eta); static void fio_client_add_hash(struct fio_client *client) @@ -200,7 +243,9 @@ int fio_client_add(const char *hostname, void **cookie) if (fio_server_parse_string(hostname, &client->hostname, &client->is_sock, &client->port, - &client->addr.sin_addr)) + &client->addr.sin_addr, + &client->addr6.sin6_addr, + &client->ipv6)) return -1; client->fd = -1; @@ -216,18 +261,31 @@ int fio_client_add(const char *hostname, void **cookie) static int fio_client_connect_ip(struct fio_client *client) { - int fd; - - client->addr.sin_family = AF_INET; - client->addr.sin_port = htons(client->port); + struct sockaddr *addr; + fio_socklen_t socklen; + int fd, domain; + + if (client->ipv6) { + client->addr6.sin6_family = AF_INET6; + client->addr6.sin6_port = htons(client->port); + domain = AF_INET6; + addr = (struct sockaddr *) &client->addr6; + socklen = sizeof(client->addr6); + } else { + client->addr.sin_family = AF_INET; + client->addr.sin_port = htons(client->port); + domain = AF_INET; + addr = (struct sockaddr *) &client->addr; + socklen = sizeof(client->addr); + } - fd = socket(AF_INET, SOCK_STREAM, 0); + fd = socket(domain, SOCK_STREAM, 0); if (fd < 0) { log_err("fio: socket: %s\n", strerror(errno)); return -1; } - if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) { + if (connect(fd, addr, socklen) < 0) { log_err("fio: connect: %s\n", strerror(errno)); log_err("fio: failed to connect to %s:%u\n", client->hostname, client->port); @@ -381,6 +439,11 @@ int fio_clients_connect(void) struct flist_head *entry, *tmp; int ret; +#ifdef WIN32 + WSADATA wsd; + WSAStartup(MAKEWORD(2,2), &wsd); +#endif + dprint(FD_NET, "client: connect all\n"); client_signal_handler(); @@ -453,6 +516,7 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename) return 1; } + client->sent_job = 1; ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size, 0); free(buf); close(fd); @@ -469,6 +533,8 @@ int fio_clients_send_ini(const char *filename) if (fio_client_send_ini(client, filename)) remove_client(client); + + client->sent_job = 1; } return !nr_clients; @@ -601,6 +667,54 @@ static void handle_gs(struct fio_net_cmd *cmd) show_group_stats(gs); } +static void convert_agg(struct disk_util_agg *agg) +{ + int i; + + for (i = 0; i < 2; i++) { + agg->ios[i] = le32_to_cpu(agg->ios[i]); + agg->merges[i] = le32_to_cpu(agg->merges[i]); + agg->sectors[i] = le64_to_cpu(agg->sectors[i]); + agg->ticks[i] = le32_to_cpu(agg->ticks[i]); + } + + 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)); +} + +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->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); +} + +static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd) +{ + struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload; + + convert_dus(&du->dus); + convert_agg(&du->agg); + + if (!client->disk_stats_shown) { + client->disk_stats_shown = 1; + log_info("\nDisk stats (read/write):\n"); + } + + print_disk_util(&du->dus, &du->agg, terse_output); +} + static void convert_jobs_eta(struct jobs_eta *je) { int i; @@ -700,6 +814,7 @@ 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; + char bit[16]; os = fio_get_os_string(probe->os); if (!os) @@ -709,15 +824,36 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) if (!arch) os = "unknown"; - 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); + sprintf(bit, "%d-bit", probe->bpp * 8); + + log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n", + probe->hostname, probe->bigendian, bit, 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) +static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd) +{ + struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload; + + client->state = Client_started; + client->jobs = le32_to_cpu(pdu->jobs); +} + +static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd) +{ + struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload; + + client->state = Client_stopped; + client->error = le32_to_cpu(pdu->error); + + if (client->error) + log_info("client <%s>: exited with error %d\n", client->hostname, client->error); +} + +static int handle_client(struct fio_client *client, struct client_ops *ops) { struct fio_net_cmd *cmd; @@ -737,43 +873,42 @@ 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> ", name); - ret = fwrite(buf, cmd->pdu_len, 1, f_out); - fflush(f_out); - client->skip_newline = strchr(buf, '\n') == NULL; + ops->text_op(client, f_out, cmd->pdu_len, buf); free(cmd); break; } + case FIO_NET_CMD_DU: + ops->disk_util(client, cmd); + free(cmd); + break; case FIO_NET_CMD_TS: - handle_ts(cmd); + ops->thread_status(cmd); free(cmd); break; case FIO_NET_CMD_GS: - handle_gs(cmd); + ops->group_stats(cmd); free(cmd); break; case FIO_NET_CMD_ETA: remove_reply_cmd(client, cmd); - handle_eta(client, cmd); + ops->eta(client, cmd); free(cmd); break; case FIO_NET_CMD_PROBE: remove_reply_cmd(client, cmd); - handle_probe(client, cmd); + ops->probe(client, cmd); + free(cmd); + break; + case FIO_NET_CMD_RUN: + client->state = Client_running; free(cmd); break; case FIO_NET_CMD_START: - client->state = Client_started; + handle_start(client, cmd); free(cmd); break; case FIO_NET_CMD_STOP: - client->state = Client_stopped; + handle_stop(client, cmd); free(cmd); break; default: @@ -805,6 +940,8 @@ static void request_client_etas(void) skipped++; continue; } + if (client->state != Client_running) + continue; assert(!client->eta_in_flight); flist_add_tail(&client->eta_list, &eta_list); @@ -868,12 +1005,10 @@ static int fio_client_timed_out(void) return ret; } -int fio_handle_clients(void) +int fio_handle_clients(struct client_ops *ops) { - struct fio_client *client; - struct flist_head *entry; struct pollfd *pfds; - int i, ret = 0; + int i, ret = 0, retval = 0; gettimeofday(&eta_tv, NULL); @@ -883,16 +1018,31 @@ int fio_handle_clients(void) init_thread_stat(&client_ts); init_group_run_stat(&client_gs); + /* Used by eta.c:display_thread_status() */ + update_thread_status = ops->thread_status_display; + while (!exit_backend && nr_clients) { + struct flist_head *entry, *tmp; + struct fio_client *client; + i = 0; - flist_for_each(entry, &client_list) { + flist_for_each_safe(entry, tmp, &client_list) { client = flist_entry(entry, struct fio_client, list); + if (!client->sent_job && + flist_empty(&client->cmd_list)) { + remove_client(client); + continue; + } + pfds[i].fd = client->fd; pfds[i].events = POLLIN; i++; } + if (!nr_clients) + break; + assert(i == nr_clients); do { @@ -926,14 +1076,16 @@ int fio_handle_clients(void) log_err("fio: unknown client fd %d\n", pfds[i].fd); continue; } - if (!handle_client(client)) { + if (!handle_client(client, ops)) { log_info("client: host=%s disconnected\n", client->hostname); remove_client(client); - } + retval = 1; + } else if (client->error) + retval = 1; } } free(pfds); - return 0; + return retval; }