X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=f1675492a6d38775f56aeb99ae91041d67b7b70d;hp=e443dc3eeba3b502c097041a3553c04a3589ca04;hb=ceab2ea2745270254c01ca2bd0195144bd79e607;hpb=d2333358fb3729de6681ed5cc3ec45cd86b5cfb8 diff --git a/client.c b/client.c index e443dc3e..f1675492 100644 --- a/client.c +++ b/client.c @@ -29,8 +29,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 +44,10 @@ struct fio_client { int skip_newline; int is_sock; + int disk_stats_shown; + unsigned int jobs; + int error; + int ipv6; struct flist_head eta_list; struct client_eta *eta_in_flight; @@ -57,8 +64,9 @@ 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); @@ -200,7 +208,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 +226,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); @@ -601,6 +624,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; @@ -720,6 +791,25 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) client->name = strdup((char *) probe->hostname); } +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 fio_net_cmd *cmd; @@ -753,6 +843,10 @@ static int handle_client(struct fio_client *client) free(cmd); break; } + case FIO_NET_CMD_DU: + handle_du(client, cmd); + free(cmd); + break; case FIO_NET_CMD_TS: handle_ts(cmd); free(cmd); @@ -771,12 +865,16 @@ static int handle_client(struct fio_client *client) handle_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: @@ -808,6 +906,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); @@ -876,7 +976,7 @@ int fio_handle_clients(void) 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); @@ -933,10 +1033,12 @@ int fio_handle_clients(void) 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; }