X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=dbc85226d90bbe38a5d21443e66c5db2b5ef2387;hp=cd850c5ac618ab36436b39ecc97dfecb799cbd87;hb=48fbb46e7c9a2721b3b23898ab9ec79727ab4e9b;hpb=e951bdc47d094d43d6f41de95c6af191b8346459

diff --git a/client.c b/client.c
index cd850c5a..dbc85226 100644
--- a/client.c
+++ b/client.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -16,22 +17,31 @@
 
 #include "fio.h"
 #include "server.h"
-#include "crc/crc32.h"
 #include "flist.h"
+#include "hash.h"
 
 struct fio_client {
 	struct flist_head list;
+	struct flist_head hash_list;
 	struct sockaddr_in addr;
+	struct sockaddr_un addr_un;
 	char *hostname;
+	int port;
 	int fd;
 
+	char *name;
+
 	int state;
 	int skip_newline;
+	int is_sock;
 
 	uint16_t argc;
 	char **argv;
 };
 
+static struct jobs_eta client_etas;
+static int received_etas;
+
 enum {
 	Client_created		= 0,
 	Client_connected	= 1,
@@ -42,32 +52,45 @@ enum {
 
 static FLIST_HEAD(client_list);
 
+#define FIO_CLIENT_HASH_BITS	7
+#define FIO_CLIENT_HASH_SZ	(1 << FIO_CLIENT_HASH_BITS)
+#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 struct fio_client *find_client_by_fd(int fd)
+static void fio_client_add_hash(struct fio_client *client)
 {
-	struct fio_client *client;
-	struct flist_head *entry;
+	int bucket = hash_long(client->fd, FIO_CLIENT_HASH_BITS);
 
-	flist_for_each(entry, &client_list) {
-		client = flist_entry(entry, struct fio_client, list);
+	bucket &= FIO_CLIENT_HASH_MASK;
+	flist_add(&client->hash_list, &client_hash[bucket]);
+}
 
-		if (client->fd == fd)
-			return client;
-	}
+static void fio_client_remove_hash(struct fio_client *client)
+{
+	if (!flist_empty(&client->hash_list))
+		flist_del_init(&client->hash_list);
+}
 
-	return NULL;
+static void fio_init fio_client_hash_init(void)
+{
+	int i;
+
+	for (i = 0; i < FIO_CLIENT_HASH_SZ; i++)
+		INIT_FLIST_HEAD(&client_hash[i]);
 }
 
-static struct fio_client *find_client_by_name(const char *name)
+static struct fio_client *find_client_by_fd(int fd)
 {
+	int bucket = hash_long(fd, FIO_CLIENT_HASH_BITS) & FIO_CLIENT_HASH_MASK;
 	struct fio_client *client;
 	struct flist_head *entry;
 
-	flist_for_each(entry, &client_list) {
-		client = flist_entry(entry, struct fio_client, list);
+	flist_for_each(entry, &client_hash[bucket]) {
+		client = flist_entry(entry, struct fio_client, hash_list);
 
-		if (!strcmp(name, client->hostname))
+		if (client->fd == fd)
 			return client;
 	}
 
@@ -78,103 +101,132 @@ static void remove_client(struct fio_client *client)
 {
 	dprint(FD_NET, "client: removed <%s>\n", client->hostname);
 	flist_del(&client->list);
-	nr_clients--;
+
+	fio_client_remove_hash(client);
 
 	free(client->hostname);
 	if (client->argv)
 		free(client->argv);
+	if (client->name)
+		free(client->name);
 
 	free(client);
+	nr_clients--;
 }
 
-static int __fio_client_add_cmd_option(struct fio_client *client,
-				       const char *opt)
+static void __fio_client_add_cmd_option(struct fio_client *client,
+					const char *opt)
 {
 	int index;
 
-	if (client->argc == FIO_NET_CMD_JOBLINE_ARGV) {
-		log_err("fio: max cmd line number reached.\n");
-		log_err("fio: cmd line <%s> has been ignored.\n", opt);
-		return 1;
-	}
-
 	index = client->argc++;
 	client->argv = realloc(client->argv, sizeof(char *) * client->argc);
 	client->argv[index] = strdup(opt);
 	dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
-	return 0;
 }
 
-int fio_client_add_cmd_option(const char *hostname, const char *opt)
+void fio_client_add_cmd_option(void *cookie, const char *opt)
 {
-	struct fio_client *client;
+	struct fio_client *client = cookie;
 
-	if (!hostname || !opt)
-		return 0;
+	if (!client || !opt)
+		return;
 
-	client = find_client_by_name(hostname);
-	if (!client) {
-		log_err("fio: unknown client %s\n", hostname);
-		return 1;
-	}
-
-	return __fio_client_add_cmd_option(client, opt);
+	__fio_client_add_cmd_option(client, opt);
 }
 
-void fio_client_add(const char *hostname)
+int fio_client_add(const char *hostname, void **cookie)
 {
 	struct fio_client *client;
 
-	dprint(FD_NET, "client: added  <%s>\n", hostname);
 	client = malloc(sizeof(*client));
 	memset(client, 0, sizeof(*client));
 
-	client->hostname = strdup(hostname);
+	INIT_FLIST_HEAD(&client->list);
+	INIT_FLIST_HEAD(&client->hash_list);
+
+	if (fio_server_parse_string(hostname, &client->hostname,
+					&client->is_sock, &client->port,
+					&client->addr.sin_addr))
+		return -1;
+
 	client->fd = -1;
 
 	__fio_client_add_cmd_option(client, "fio");
 
 	flist_add(&client->list, &client_list);
 	nr_clients++;
+	dprint(FD_NET, "client: added <%s>\n", client->hostname);
+	*cookie = client;
+	return 0;
 }
 
-static int fio_client_connect(struct fio_client *client)
+static int fio_client_connect_ip(struct fio_client *client)
 {
 	int fd;
 
-	dprint(FD_NET, "client: connect to host %s\n", client->hostname);
-
-	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(client->hostname);
-		if (!hent) {
-			log_err("fio: gethostbyname: %s\n", strerror(errno));
-			log_err("fio: failed looking up hostname %s\n",
-					client->hostname);
-			return 1;
-		}
-
-		memcpy(&client->addr.sin_addr, hent->h_addr, 4);
-	}
+	client->addr.sin_port = htons(client->port);
 
 	fd = socket(AF_INET, SOCK_STREAM, 0);
 	if (fd < 0) {
 		log_err("fio: socket: %s\n", strerror(errno));
-		return 1;
+		return -1;
 	}
 
 	if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
 		log_err("fio: connect: %s\n", strerror(errno));
-		log_err("fio: failed to connect to %s\n", client->hostname);
-		return 1;
+		log_err("fio: failed to connect to %s:%u\n", client->hostname,
+								client->port);
+		close(fd);
+		return -1;
+	}
+
+	return fd;
+}
+
+static int fio_client_connect_sock(struct fio_client *client)
+{
+	struct sockaddr_un *addr = &client->addr_un;
+	fio_socklen_t len;
+	int fd;
+
+	memset(addr, 0, sizeof(*addr));
+	addr->sun_family = AF_UNIX;
+	strcpy(addr->sun_path, client->hostname);
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0) {
+		log_err("fio: socket: %s\n", strerror(errno));
+		return -1;
 	}
 
+	len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1;
+	if (connect(fd, (struct sockaddr *) addr, len) < 0) {
+		log_err("fio: connect; %s\n", strerror(errno));
+		close(fd);
+		return -1;
+	}
+
+	return fd;
+}
+
+static int fio_client_connect(struct fio_client *client)
+{
+	int fd;
+
+	dprint(FD_NET, "client: connect to host %s\n", client->hostname);
+
+	if (client->is_sock)
+		fd = fio_client_connect_sock(client);
+	else
+		fd = fio_client_connect_ip(client);
+
+	if (fd < 0)
+		return 1;
+
 	client->fd = fd;
+	fio_client_add_hash(client);
 	client->state = Client_connected;
 	return 0;
 }
@@ -195,7 +247,7 @@ void fio_clients_terminate(void)
 
 static void sig_int(int sig)
 {
-	dprint(FD_NET, "client: got sign %d\n", sig);
+	dprint(FD_NET, "client: got signal %d\n", sig);
 	fio_clients_terminate();
 }
 
@@ -224,17 +276,41 @@ static void probe_client(struct fio_client *client)
 
 static int send_client_cmd_line(struct fio_client *client)
 {
-	struct cmd_line_pdu *pdu;
+	struct cmd_single_line_pdu *cslp;
+	struct cmd_line_pdu *clp;
+	unsigned long offset;
+	void *pdu;
+	size_t mem;
 	int i, ret;
 
 	dprint(FD_NET, "client: send cmdline %d\n", client->argc);
 
-	pdu = malloc(sizeof(*pdu));
-	for (i = 0; i < client->argc; i++)
-		strcpy((char *) pdu->argv[i], client->argv[i]);
+	/*
+	 * Find out how much mem we need
+	 */
+	for (i = 0, mem = 0; i < client->argc; i++)
+		mem += strlen(client->argv[i]) + 1;
+
+	/*
+	 * We need one cmd_line_pdu, and argc number of cmd_single_line_pdu
+	 */
+	mem += sizeof(*clp) + (client->argc * sizeof(*cslp));
+
+	pdu = malloc(mem);
+	clp = pdu;
+	offset = sizeof(*clp);
+
+	for (i = 0; i < client->argc; i++) {
+		uint16_t arg_len = strlen(client->argv[i]) + 1;
 
-	pdu->argc = cpu_to_le16(client->argc);
-	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu));
+		cslp = pdu + offset;
+		strcpy((char *) cslp->text, client->argv[i]);
+		cslp->len = cpu_to_le16(arg_len);
+		offset += sizeof(*cslp) + arg_len;
+	}
+
+	clp->lines = cpu_to_le16(client->argc);
+	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem);
 	free(pdu);
 	return ret;
 }
@@ -288,6 +364,7 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
 
 	if (fstat(fd, &sb) < 0) {
 		log_err("fio: job file stat: %s\n", strerror(errno));
+		close(fd);
 		return 1;
 	}
 
@@ -311,11 +388,14 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
 
 	if (len) {
 		log_err("fio: failed reading job file %s\n", filename);
+		close(fd);
+		free(buf);
 		return 1;
 	}
 
 	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
 	free(buf);
+	close(fd);
 	return ret;
 }
 
@@ -447,9 +527,8 @@ static void handle_gs(struct fio_net_cmd *cmd)
 	show_group_stats(gs);
 }
 
-static void handle_eta(struct fio_net_cmd *cmd)
+static void convert_jobs_eta(struct jobs_eta *je)
 {
-	struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
 	int i;
 
 	je->nr_running		= le32_to_cpu(je->nr_running);
@@ -466,19 +545,72 @@ static void handle_eta(struct fio_net_cmd *cmd)
 		je->iops[i]	= le32_to_cpu(je->iops[i]);
 	}
 
-	je->elapsed_sec		= le32_to_cpu(je->nr_running);
+	je->elapsed_sec		= le64_to_cpu(je->elapsed_sec);
 	je->eta_sec		= le64_to_cpu(je->eta_sec);
+}
+
+static void sum_jobs_eta(struct jobs_eta *je)
+{
+	struct jobs_eta *dst = &client_etas;
+	int i;
+
+	dst->nr_running		+= je->nr_running;
+	dst->nr_ramp		+= je->nr_ramp;
+	dst->nr_pending		+= je->nr_pending;
+	dst->files_open		+= je->files_open;
+	dst->m_rate		+= je->m_rate;
+	dst->t_rate		+= je->t_rate;
+	dst->m_iops		+= je->m_iops;
+	dst->t_iops		+= je->t_iops;
+
+	for (i = 0; i < 2; i++) {
+		dst->rate[i]	+= je->rate[i];
+		dst->iops[i]	+= je->iops[i];
+	}
+
+	dst->elapsed_sec	+= je->elapsed_sec;
 
-	display_thread_status(je);
+	if (je->eta_sec > dst->eta_sec)
+		dst->eta_sec = je->eta_sec;
 }
 
-static void handle_probe(struct fio_net_cmd *cmd)
+static void handle_eta(struct fio_net_cmd *cmd)
+{
+	struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
+
+	convert_jobs_eta(je);
+
+	if (nr_clients > 1) {
+		sum_jobs_eta(je);
+		received_etas++;
+		if (received_etas == nr_clients) {
+			received_etas = 0;
+			display_thread_status(&client_etas);
+			memset(&client_etas, 0, sizeof(client_etas));
+		}
+	} else
+		display_thread_status(je);
+}
+
+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;
+
+	os = fio_get_os_string(probe->os);
+	if (!os)
+		os = "unknown";
 
-	log_info("Probe: hostname=%s, be=%u, fio ver %u.%u.%u\n",
-		probe->hostname, probe->bigendian, probe->fio_major,
+	arch = fio_get_arch_string(probe->arch);
+	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);
+
+	if (!client->name)
+		client->name = strdup((char *) probe->hostname);
 }
 
 static int handle_client(struct fio_client *client)
@@ -501,10 +633,13 @@ 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> ", client->hostname);
+			fprintf(f_out, "<%s> ", name);
 		ret = fwrite(buf, cmd->pdu_len, 1, f_out);
 		fflush(f_out);
 		client->skip_newline = strchr(buf, '\n') == NULL;
@@ -524,7 +659,7 @@ static int handle_client(struct fio_client *client)
 		free(cmd);
 		break;
 	case FIO_NET_CMD_PROBE:
-		handle_probe(cmd);
+		handle_probe(client, cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_START:
@@ -582,7 +717,7 @@ int fio_handle_clients(void)
 
 			client = find_client_by_fd(pfds[i].fd);
 			if (!client) {
-				log_err("fio: unknown client\n");
+				log_err("fio: unknown client fd %d\n", pfds[i].fd);
 				continue;
 			}
 			if (!handle_client(client)) {