X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=c6588664ecd3613501154b21810a2c0f98a5c69a;hp=6aaad0193d2b6d272bcfb31afb20bf421a278ad0;hb=ddcc0b69aa4ed04c8681f447a1a6274bb8837a14;hpb=37db14feece08eb6e43de87c404180650ed5aa6f

diff --git a/client.c b/client.c
index 6aaad019..c6588664 100644
--- a/client.c
+++ b/client.c
@@ -16,28 +16,91 @@
 #include "fio.h"
 #include "server.h"
 #include "crc/crc32.h"
+#include "flist.h"
 
-int fio_client_fd = -1;
+struct fio_client {
+	struct flist_head list;
+	struct sockaddr_in addr;
+	char *hostname;
+	int fd;
+};
 
-int fio_client_connect(const char *host)
+static FLIST_HEAD(client_list);
+
+static struct fio_client *find_client_by_fd(int fd)
+{
+	struct fio_client *client;
+	struct flist_head *entry;
+
+	flist_for_each(entry, &client_list) {
+		client = flist_entry(entry, struct fio_client, list);
+
+		if (client->fd == fd)
+			return client;
+	}
+
+	return NULL;
+}
+
+#if 0
+static struct fio_client *find_client_by_name(const char *name)
+{
+	struct fio_client *client;
+	struct flist_head *entry;
+
+	flist_for_each(entry, &client_list) {
+		client = flist_entry(entry, struct fio_client, list);
+
+		if (!strcmp(name, client->hostname))
+			return client;
+	}
+
+	return NULL;
+}
+#endif
+
+static void remove_client(struct fio_client *client)
+{
+	dprint(FD_NET, "removed client <%s>\n", client->hostname);
+	flist_del(&client->list);
+	nr_clients--;
+	free(client->hostname);
+	free(client);
+}
+
+void fio_client_add(const char *hostname)
+{
+	struct fio_client *client;
+
+	dprint(FD_NET, "added client <%s>\n", hostname);
+	client = malloc(sizeof(*client));
+	memset(client, 0, sizeof(*client));
+	client->hostname = strdup(hostname);
+	client->fd = -1;
+	flist_add(&client->list, &client_list);
+	nr_clients++;
+}
+
+static int fio_client_connect(struct fio_client *client)
 {
-	struct sockaddr_in addr;
 	int fd;
 
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(fio_net_port);
+	dprint(FD_NET, "connect to host %s\n", client->hostname);
 
-	if (inet_aton(host, &addr.sin_addr) != 1) {
+	memset(&client->addr, 0, sizeof(client->addr));
+	client->addr.sin_family = AF_INET;
+	client->addr.sin_port = htons(fio_net_port);
+
+	if (inet_aton(client->hostname, &client->addr.sin_addr) != 1) {
 		struct hostent *hent;
 
-		hent = gethostbyname(host);
+		hent = gethostbyname(client->hostname);
 		if (!hent) {
 			log_err("fio: gethostbyname: %s\n", strerror(errno));
 			return 1;
 		}
 
-		memcpy(&addr.sin_addr, hent->h_addr, 4);
+		memcpy(&client->addr.sin_addr, hent->h_addr, 4);
 	}
 
 	fd = socket(AF_INET, SOCK_STREAM, 0);
@@ -46,46 +109,50 @@ int fio_client_connect(const char *host)
 		return 1;
 	}
 
-	if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
 		log_err("fio: connect: %s\n", strerror(errno));
 		return 1;
 	}
 
-	fio_client_fd = fd;
+	client->fd = fd;
 	return 0;
 }
 
-static int send_file_buf(char *buf, off_t size)
+int fio_clients_connect(void)
 {
-	struct fio_net_cmd *cmd;
+	struct fio_client *client;
+	struct flist_head *entry, *tmp;
 	int ret;
 
-	cmd = malloc(sizeof(*cmd) + size);
-
-	fio_init_net_cmd(cmd);
-	cmd->opcode	= cpu_to_le16(FIO_NET_CMD_JOB_END);
-	cmd->pdu_len	= cpu_to_le32(size);
+	flist_for_each_safe(entry, tmp, &client_list) {
+		client = flist_entry(entry, struct fio_client, list);
 
-	memcpy(&cmd->payload, buf, size);
+		ret = fio_client_connect(client);
+		if (ret)
+			remove_client(client);
+	}
 
-	fio_net_cmd_crc(cmd);
+	return !nr_clients;
+}
 
-	ret = fio_send_data(fio_client_fd, cmd, sizeof(*cmd) + size);
-	free(cmd);
-	return ret;
+static int send_file_buf(struct fio_client *client, char *buf, off_t size)
+{
+	return fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, size);
 }
 
 /*
  * Send file contents to server backend. We could use sendfile(), but to remain
  * more portable lets just read/write the darn thing.
  */
-int fio_client_send_ini(const char *filename)
+static int fio_client_send_ini(struct fio_client *client, const char *filename)
 {
 	struct stat sb;
 	char *p, *buf;
 	off_t len;
 	int fd, ret;
 
+	dprint(FD_NET, "send ini %s to %s\n", filename, client->hostname);
+
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
 		log_err("fio: job file open: %s\n", strerror(errno));
@@ -115,31 +182,217 @@ int fio_client_send_ini(const char *filename)
 			continue;
 	} while (1);
 
-	ret = send_file_buf(buf, sb.st_size);
+	ret = send_file_buf(client, buf, sb.st_size);
 	free(buf);
 	return ret;
 }
 
-int fio_handle_clients(void)
+int fio_clients_send_ini(const char *filename)
+{
+	struct fio_client *client;
+	struct flist_head *entry, *tmp;
+
+	flist_for_each_safe(entry, tmp, &client_list) {
+		client = flist_entry(entry, struct fio_client, list);
+
+		if (fio_client_send_ini(client, filename))
+			remove_client(client);
+	}
+
+	return !nr_clients;
+}
+
+static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
+{
+	dst->max_val	= le64_to_cpu(src->max_val);
+	dst->min_val	= le64_to_cpu(src->min_val);
+	dst->samples	= le64_to_cpu(src->samples);
+	/* FIXME */
+	dst->mean	= __le64_to_cpu(src->mean);
+	dst->S		= __le64_to_cpu(src->S);
+}
+
+static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
+{
+	int i, j;
+
+	dst->error	= le32_to_cpu(src->error);
+	dst->groupid	= le32_to_cpu(src->groupid);
+	dst->pid	= le32_to_cpu(src->pid);
+	dst->members	= le32_to_cpu(src->members);
+
+	for (i = 0; i < 2; i++) {
+		convert_io_stat(&dst->clat_stat[i], &src->clat_stat[i]);
+		convert_io_stat(&dst->slat_stat[i], &src->slat_stat[i]);
+		convert_io_stat(&dst->lat_stat[i], &src->lat_stat[i]);
+		convert_io_stat(&dst->bw_stat[i], &src->bw_stat[i]);
+	}
+
+	dst->usr_time		= le64_to_cpu(src->usr_time);
+	dst->sys_time		= le64_to_cpu(src->sys_time);
+	dst->ctx		= le64_to_cpu(src->ctx);
+	dst->minf		= le64_to_cpu(src->minf);
+	dst->majf		= le64_to_cpu(src->majf);
+	dst->clat_percentiles	= le64_to_cpu(src->clat_percentiles);
+	dst->percentile_list	= NULL;
+
+	for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
+		dst->io_u_map[i]	= le32_to_cpu(src->io_u_map[i]);
+		dst->io_u_submit[i]	= le32_to_cpu(src->io_u_submit[i]);
+		dst->io_u_complete[i]	= le32_to_cpu(src->io_u_complete[i]);
+	}
+
+	for (i = 0; i < FIO_IO_U_LAT_U_NR; i++) {
+		dst->io_u_lat_u[i]	= le32_to_cpu(src->io_u_lat_u[i]);
+		dst->io_u_lat_m[i]	= le32_to_cpu(src->io_u_lat_m[i]);
+	}
+
+	for (i = 0; i < 2; i++)
+		for (j = 0; j < FIO_IO_U_PLAT_NR; j++)
+			dst->io_u_plat[i][j] = le32_to_cpu(src->io_u_plat[i][j]);
+
+	for (i = 0; i < 3; i++) {
+		dst->total_io_u[i]	= le64_to_cpu(src->total_io_u[i]);
+		dst->short_io_u[i]	= le64_to_cpu(src->total_io_u[i]);
+	}
+
+	dst->total_submit	= le64_to_cpu(src->total_submit);
+	dst->total_complete	= le64_to_cpu(src->total_complete);
+
+	for (i = 0; i < 2; i++) {
+		dst->io_bytes[i]	= le64_to_cpu(src->io_bytes[i]);
+		dst->runtime[i]		= le64_to_cpu(src->runtime[i]);
+	}
+
+	dst->total_run_time	= le64_to_cpu(src->total_run_time);
+	dst->continue_on_error	= le16_to_cpu(src->continue_on_error);
+	dst->total_err_count	= le64_to_cpu(src->total_err_count);
+	dst->first_error	= le32_to_cpu(src->first_error);
+	dst->kb_base		= le32_to_cpu(src->kb_base);
+}
+
+static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
+{
+	int i;
+
+	for (i = 0; i < 2; i++) {
+		dst->max_run[i]		= le64_to_cpu(src->max_run[i]);
+		dst->min_run[i]		= le64_to_cpu(src->min_run[i]);
+		dst->max_bw[i]		= le64_to_cpu(src->max_bw[i]);
+		dst->min_bw[i]		= le64_to_cpu(src->min_bw[i]);
+		dst->io_kb[i]		= le64_to_cpu(src->io_kb[i]);
+		dst->agg[i]		= le64_to_cpu(src->agg[i]);
+	}
+
+	dst->kb_base	= le32_to_cpu(src->kb_base);
+	dst->groupid	= le32_to_cpu(src->groupid);
+}
+
+static void handle_ts(struct fio_net_cmd *cmd)
+{
+	struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
+
+	convert_ts(&p->ts, &p->ts);
+	convert_gs(&p->rs, &p->rs);
+
+	show_thread_status(&p->ts, &p->rs);
+}
+
+static void handle_gs(struct fio_net_cmd *cmd)
+{
+	struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
+
+	convert_gs(gs, gs);
+	show_group_stats(gs);
+}
+
+static int handle_client(struct fio_client *client)
 {
 	struct fio_net_cmd *cmd;
+	int done = 0;
 
-	while (!exit_backend) {
-		cmd = fio_net_cmd_read(fio_client_fd);
+	while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
+		dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
+							cmd->opcode);
 
-		if (cmd->opcode == FIO_NET_CMD_ACK) {
+		switch (cmd->opcode) {
+		case FIO_NET_CMD_ACK:
 			free(cmd);
-			continue;
-		}
-		if (cmd->opcode != FIO_NET_CMD_TEXT) {
-			printf("non text: %d\n", cmd->opcode);
+			break;
+		case FIO_NET_CMD_QUIT:
+			remove_client(client);
+			free(cmd);
+			done = 1;
+			break;
+		case FIO_NET_CMD_TEXT:
+			fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
+			fflush(stdout);
 			free(cmd);
+			break;
+		case FIO_NET_CMD_TS:
+			handle_ts(cmd);
+			free(cmd);
+			break;
+		case FIO_NET_CMD_GS:
+			handle_gs(cmd);
+			free(cmd);
+			break;
+		default:
+			log_err("fio: unknown client op: %d\n", cmd->opcode);
+			free(cmd);
+			break;
+		}
+
+		if (done)
+			break;
+	}
+
+	return 0;
+}
+
+int fio_handle_clients(void)
+{
+	struct fio_client *client;
+	struct flist_head *entry;
+	struct pollfd *pfds;
+	int i, ret = 0;
+
+	pfds = malloc(nr_clients * sizeof(struct pollfd));
+
+	while (!exit_backend && nr_clients) {
+		i = 0;
+		flist_for_each(entry, &client_list) {
+			client = flist_entry(entry, struct fio_client, list);
+
+			pfds[i].fd = client->fd;
+			pfds[i].events = POLLIN;
+			i++;
+		}
+
+		assert(i == nr_clients);
+
+		ret = poll(pfds, nr_clients, 100);
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			log_err("fio: poll clients: %s\n", strerror(errno));
+			break;
+		} else if (!ret)
 			continue;
+
+		for (i = 0; i < nr_clients; i++) {
+			if (!(pfds[i].revents & POLLIN))
+				continue;
+
+			client = find_client_by_fd(pfds[i].fd);
+			if (!client) {
+				log_err("fio: unknown client\n");
+				continue;
+			}
+			handle_client(client);
 		}
-		printf("%s", cmd->payload);
-		fflush(stdout);
-		free(cmd);
 	}
 
+	free(pfds);
 	return 0;
 }