X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=7c9910961e7dee6685cd473b5d2193c0cd8a0391;hb=ad9c0fbc7ce6d1bba089f543036c997cbad84d7b;hp=fbeac35bfb30dd46635edfab70a6adb851b81c0e;hpb=498c92c27b475bcc0cb65e529fb02713bc1fb62c;p=fio.git diff --git a/client.c b/client.c index fbeac35b..7c991096 100644 --- a/client.c +++ b/client.c @@ -29,11 +29,15 @@ 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; + unsigned int refs; char *name; @@ -44,6 +48,8 @@ struct fio_client { 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; @@ -114,8 +120,10 @@ static struct fio_client *find_client_by_fd(int fd) flist_for_each(entry, &client_hash[bucket]) { client = flist_entry(entry, struct fio_client, hash_list); - if (client->fd == fd) + if (client->fd == fd) { + client->refs++; return client; + } } return NULL; @@ -123,6 +131,11 @@ static struct fio_client *find_client_by_fd(int fd) static void remove_client(struct fio_client *client) { + assert(client->refs); + + if (--client->refs) + return; + dprint(FD_NET, "client: removed <%s>\n", client->hostname); flist_del(&client->list); @@ -144,6 +157,11 @@ static void remove_client(struct fio_client *client) sum_stat_clients--; } +static void put_client(struct fio_client *client) +{ + remove_client(client); +} + static void __fio_client_add_cmd_option(struct fio_client *client, const char *opt) { @@ -204,10 +222,13 @@ 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; + client->refs = 1; __fio_client_add_cmd_option(client, "fio"); @@ -220,18 +241,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); @@ -310,6 +344,11 @@ static void sig_int(int sig) fio_clients_terminate(); } +static void sig_show_status(int sig) +{ + show_running_run_stats(); +} + static void client_signal_handler(void) { struct sigaction act; @@ -323,6 +362,11 @@ static void client_signal_handler(void) act.sa_handler = sig_int; act.sa_flags = SA_RESTART; sigaction(SIGTERM, &act, NULL); + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_show_status; + act.sa_flags = SA_RESTART; + sigaction(SIGUSR1, &act, NULL); } static void probe_client(struct fio_client *client) @@ -385,6 +429,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(); @@ -457,6 +506,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); @@ -473,6 +523,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; @@ -619,7 +671,7 @@ static void convert_agg(struct disk_util_agg *agg) 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 = __le64_to_cpu(fio_uint64_to_double(agg->max_util.u.i)); + 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) @@ -673,6 +725,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->elapsed_sec = le64_to_cpu(je->elapsed_sec); je->eta_sec = le64_to_cpu(je->eta_sec); + je->is_pow2 = le32_to_cpu(je->is_pow2); } static void sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) @@ -764,9 +817,9 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) sprintf(bit, "%d-bit", probe->bpp * 8); - log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n", + log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n", probe->hostname, probe->bigendian, bit, os, arch, - probe->fio_major, probe->fio_minor, probe->fio_patch); + probe->fio_version); if (!client->name) client->name = strdup((char *) probe->hostname); @@ -954,8 +1007,6 @@ static int fio_client_timed_out(void) int fio_handle_clients(void) { - struct fio_client *client; - struct flist_head *entry; struct pollfd *pfds; int i, ret = 0, retval = 0; @@ -968,15 +1019,27 @@ int fio_handle_clients(void) init_group_run_stat(&client_gs); 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 { @@ -1015,9 +1078,9 @@ int fio_handle_clients(void) client->hostname); remove_client(client); retval = 1; - } - if (client->error) + } else if (client->error) retval = 1; + put_client(client); } }