X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=93c7103f1a3f40f7a42fe2afa5ecea4c162147fc;hp=c40511ebe553b3b0f5dd8079bdbb4c072a2c4140;hb=45054cbec0e624de3b79a795d7dfe1c64cdea934;hpb=37f0c1ae23ad1716403d3d113c3dfdf41c47e329

diff --git a/client.c b/client.c
index c40511eb..93c7103f 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;
 
@@ -41,6 +45,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;
@@ -49,6 +58,9 @@ struct fio_client {
 
 	uint16_t argc;
 	char **argv;
+
+	char **ini_file;
+	unsigned int nr_ini_file;
 };
 
 static struct timeval eta_tv;
@@ -57,8 +69,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);
@@ -110,8 +123,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;
@@ -119,6 +134,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);
 
@@ -134,9 +154,19 @@ static void remove_client(struct fio_client *client)
 		free(client->argv);
 	if (client->name)
 		free(client->name);
+	while (client->nr_ini_file)
+		free(client->ini_file[--client->nr_ini_file]);
+	if (client->ini_file)
+		free(client->ini_file);
 
 	free(client);
 	nr_clients--;
+	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,
@@ -170,6 +200,19 @@ void fio_client_add_cmd_option(void *cookie, const char *opt)
 	}
 }
 
+void fio_client_add_ini_file(void *cookie, const char *ini_file)
+{
+	struct fio_client *client = cookie;
+	size_t new_size;
+
+	dprint(FD_NET, "client <%s>: add ini %s\n", client->hostname, ini_file);
+
+	new_size = (client->nr_ini_file + 1) * sizeof(char *);
+	client->ini_file = realloc(client->ini_file, new_size);
+	client->ini_file[client->nr_ini_file] = strdup(ini_file);
+	client->nr_ini_file++;
+}
+
 int fio_client_add(const char *hostname, void **cookie)
 {
 	struct fio_client *existing = *cookie;
@@ -199,10 +242,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");
 
@@ -215,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);
@@ -305,6 +364,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;
@@ -318,6 +382,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)
@@ -380,6 +449,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();
@@ -452,6 +526,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);
@@ -466,8 +541,21 @@ int fio_clients_send_ini(const char *filename)
 	flist_for_each_safe(entry, tmp, &client_list) {
 		client = flist_entry(entry, struct fio_client, list);
 
-		if (fio_client_send_ini(client, filename))
+		if (client->nr_ini_file) {
+			int i;
+
+			for (i = 0; i < client->nr_ini_file; i++) {
+				const char *ini = client->ini_file[i];
+
+				if (fio_client_send_ini(client, ini)) {
+					remove_client(client);
+					break;
+				}
+			}
+		} else if (!filename || fio_client_send_ini(client, filename))
 			remove_client(client);
+
+		client->sent_job = 1;
 	}
 
 	return !nr_clients;
@@ -600,6 +688,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, output_format == FIO_OUTPUT_TERSE);
+}
+
 static void convert_jobs_eta(struct jobs_eta *je)
 {
 	int i;
@@ -620,6 +756,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)
@@ -662,7 +799,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
 	flist_for_each(entry, &client->cmd_list) {
 		icmd = flist_entry(entry, struct fio_net_int_cmd, list);
 
-		if (cmd->tag == (uint64_t) icmd)
+		if (cmd->tag == (uintptr_t) icmd)
 			break;
 
 		icmd = NULL;
@@ -681,7 +818,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
 static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
 {
 	struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
-	struct client_eta *eta = (struct client_eta *) cmd->tag;
+	struct client_eta *eta = (struct client_eta *) (uintptr_t) cmd->tag;
 
 	dprint(FD_NET, "client: got eta tag %p, %d\n", eta, eta->pending);
 
@@ -699,6 +836,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)
@@ -708,14 +846,35 @@ 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=%s\n",
+		probe->hostname, probe->bigendian, bit, os, arch,
+		probe->fio_version);
 
 	if (!client->name)
 		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;
@@ -749,6 +908,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);
@@ -767,12 +930,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:
@@ -804,12 +971,14 @@ 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);
 		client->eta_in_flight = eta;
 		fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_SEND_ETA,
-					(uint64_t) eta, &client->cmd_list);
+					(uintptr_t) eta, &client->cmd_list);
 	}
 
 	while (skipped--)
@@ -869,10 +1038,8 @@ 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;
+	int i, ret = 0, retval = 0;
 
 	gettimeofday(&eta_tv, NULL);
 
@@ -883,15 +1050,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 {
@@ -929,10 +1108,13 @@ 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;
+			put_client(client);
 		}
 	}
 
 	free(pfds);
-	return 0;
+	return retval;
 }