X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=10d41e5b33cc738f06b25c20f074af090538cdb1;hp=d538e8ab95cdecb6dabde63dbf7469c1416fef80;hb=b94cba47cfdf96e72ec894080b3a7bf645a86e9c;hpb=d5e3a0c6f5376e0d76143edb2c1622efd77f995f

diff --git a/client.c b/client.c
index d538e8ab..10d41e5b 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,17 +17,21 @@
 
 #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 fd_hash_list;
+	struct flist_head name_hash_list;
 	struct sockaddr_in addr;
+	struct sockaddr_un addr_un;
 	char *hostname;
 	int fd;
 
 	int state;
 	int skip_newline;
+	int is_sock;
 
 	uint16_t argc;
 	char **argv;
@@ -42,15 +47,60 @@ enum {
 
 static FLIST_HEAD(client_list);
 
-static int handle_client(struct fio_client *client, int one);
+#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_fd_hash[FIO_CLIENT_HASH_SZ];
+static struct flist_head client_name_hash[FIO_CLIENT_HASH_SZ];
+
+static int handle_client(struct fio_client *client);
+
+static void fio_client_add_fd_hash(struct fio_client *client)
+{
+	int bucket = hash_long(client->fd, FIO_CLIENT_HASH_BITS);
+
+	bucket &= FIO_CLIENT_HASH_MASK;
+	flist_add(&client->fd_hash_list, &client_fd_hash[bucket]);
+}
+
+static void fio_client_remove_fd_hash(struct fio_client *client)
+{
+	if (!flist_empty(&client->fd_hash_list))
+		flist_del_init(&client->fd_hash_list);
+}
+
+static void fio_client_add_name_hash(struct fio_client *client)
+{
+	int bucket = jhash(client->hostname, strlen(client->hostname), 0);
+
+	bucket &= FIO_CLIENT_HASH_MASK;
+	flist_add(&client->name_hash_list, &client_name_hash[bucket]);
+}
+
+static void fio_client_remove_name_hash(struct fio_client *client)
+{
+	if (!flist_empty(&client->name_hash_list))
+		flist_del_init(&client->name_hash_list);
+}
+
+static void fio_init fio_client_hash_init(void)
+{
+	int i;
+
+	for (i = 0; i < FIO_CLIENT_HASH_SZ; i++) {
+		INIT_FLIST_HEAD(&client_fd_hash[i]);
+		INIT_FLIST_HEAD(&client_name_hash[i]);
+	}
+}
 
 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_fd_hash[bucket]) {
+		client = flist_entry(entry, struct fio_client, fd_hash_list);
 
 		if (client->fd == fd)
 			return client;
@@ -61,11 +111,12 @@ static struct fio_client *find_client_by_fd(int fd)
 
 static struct fio_client *find_client_by_name(const char *name)
 {
+	int bucket = jhash(name, strlen(name), 0) & FIO_CLIENT_HASH_BITS;
 	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_name_hash[bucket]) {
+		client = flist_entry(entry, struct fio_client, name_hash_list);
 
 		if (!strcmp(name, client->hostname))
 			return client;
@@ -78,40 +129,50 @@ 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_fd_hash(client);
+	fio_client_remove_name_hash(client);
 
 	free(client->hostname);
 	if (client->argv)
 		free(client->argv);
 
 	free(client);
+	nr_clients--;
 }
 
-static void __fio_client_add_cmd_option(struct fio_client *client,
-					const char *opt)
+static int __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;
 }
 
-void fio_client_add_cmd_option(const char *hostname, const char *opt)
+int fio_client_add_cmd_option(const char *hostname, const char *opt)
 {
 	struct fio_client *client;
 
 	if (!hostname || !opt)
-		return;
+		return 0;
 
 	client = find_client_by_name(hostname);
 	if (!client) {
 		log_err("fio: unknown client %s\n", hostname);
-		return;
+		return 1;
 	}
 
-	__fio_client_add_cmd_option(client, opt);
+	return __fio_client_add_cmd_option(client, opt);
 }
 
 void fio_client_add(const char *hostname)
@@ -122,22 +183,30 @@ void fio_client_add(const char *hostname)
 	client = malloc(sizeof(*client));
 	memset(client, 0, sizeof(*client));
 
-	client->hostname = strdup(hostname);
+	INIT_FLIST_HEAD(&client->list);
+	INIT_FLIST_HEAD(&client->fd_hash_list);
+	INIT_FLIST_HEAD(&client->name_hash_list);
+
+	if (!strncmp(hostname, "sock:", 5)) {
+		client->hostname = strdup(hostname + 5);
+		client->is_sock = 1;
+	} else
+		client->hostname = strdup(hostname);
+
 	client->fd = -1;
 
+	fio_client_add_name_hash(client);
+
 	__fio_client_add_cmd_option(client, "fio");
 
 	flist_add(&client->list, &client_list);
 	nr_clients++;
 }
 
-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);
 
@@ -147,7 +216,9 @@ static int fio_client_connect(struct fio_client *client)
 		hent = gethostbyname(client->hostname);
 		if (!hent) {
 			log_err("fio: gethostbyname: %s\n", strerror(errno));
-			return 1;
+			log_err("fio: failed looking up hostname %s\n",
+					client->hostname);
+			return -1;
 		}
 
 		memcpy(&client->addr.sin_addr, hent->h_addr, 4);
@@ -156,16 +227,63 @@ static int fio_client_connect(struct fio_client *client)
 	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;
+		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);
+
+	memset(&client->addr, 0, sizeof(client->addr));
+
+	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_fd_hash(client);
 	client->state = Client_connected;
 	return 0;
 }
@@ -210,7 +328,7 @@ static void probe_client(struct fio_client *client)
 	dprint(FD_NET, "client: send probe\n");
 
 	fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
-	handle_client(client, 1);
+	handle_client(client);
 }
 
 static int send_client_cmd_line(struct fio_client *client)
@@ -273,12 +391,13 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		log_err("fio: job file open: %s\n", strerror(errno));
+		log_err("fio: job file <%s> open: %s\n", filename, strerror(errno));
 		return 1;
 	}
 
 	if (fstat(fd, &sb) < 0) {
 		log_err("fio: job file stat: %s\n", strerror(errno));
+		close(fd);
 		return 1;
 	}
 
@@ -302,11 +421,13 @@ 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);
 		return 1;
 	}
 
 	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
 	free(buf);
+	close(fd);
 	return ret;
 }
 
@@ -472,69 +593,67 @@ static void handle_probe(struct fio_net_cmd *cmd)
 		probe->fio_minor, probe->fio_patch);
 }
 
-static int handle_client(struct fio_client *client, int one)
+static int handle_client(struct fio_client *client)
 {
 	struct fio_net_cmd *cmd;
-	int done = 0;
 
 	dprint(FD_NET, "client: handle %s\n", client->hostname);
 
-	while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
-		dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
-							cmd->opcode);
-
-		switch (cmd->opcode) {
-		case FIO_NET_CMD_QUIT:
-			remove_client(client);
-			free(cmd);
-			done = 1;
-			break;
-		case FIO_NET_CMD_TEXT: {
-			const char *buf = (const char *) cmd->payload;
-
-			if (!client->skip_newline)
-				fprintf(f_out, "Client <%s>: ", client->hostname);
-			fwrite(buf, cmd->pdu_len, 1, f_out);
-			fflush(f_out);
-			client->skip_newline = strchr(buf, '\n') == NULL;
-			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;
-		case FIO_NET_CMD_ETA:
-			handle_eta(cmd);
-			free(cmd);
-			break;
-		case FIO_NET_CMD_PROBE:
-			handle_probe(cmd);
-			free(cmd);
-			break;
-		case FIO_NET_CMD_START:
-			client->state = Client_started;
-			free(cmd);
-			break;
-		case FIO_NET_CMD_STOP:
-			client->state = Client_stopped;
-			free(cmd);
-			break;
-		default:
-			log_err("fio: unknown client op: %d\n", cmd->opcode);
-			free(cmd);
-			break;
+	cmd = fio_net_recv_cmd(client->fd);
+	if (!cmd)
+		return 0;
+
+	dprint(FD_NET, "client: got cmd op %d from %s\n",
+					cmd->opcode, client->hostname);
+
+	switch (cmd->opcode) {
+	case FIO_NET_CMD_QUIT:
+		remove_client(client);
+		free(cmd);
+		break;
+	case FIO_NET_CMD_TEXT: {
+		const char *buf = (const char *) cmd->payload;
+		int fio_unused ret;
+
+		if (!client->skip_newline)
+			fprintf(f_out, "<%s> ", client->hostname);
+		ret = fwrite(buf, cmd->pdu_len, 1, f_out);
+		fflush(f_out);
+		client->skip_newline = strchr(buf, '\n') == NULL;
+		free(cmd);
+		break;
 		}
-
-		if (done || one)
-			break;
+	case FIO_NET_CMD_TS:
+		handle_ts(cmd);
+		free(cmd);
+		break;
+	case FIO_NET_CMD_GS:
+		handle_gs(cmd);
+		free(cmd);
+		break;
+	case FIO_NET_CMD_ETA:
+		handle_eta(cmd);
+		free(cmd);
+		break;
+	case FIO_NET_CMD_PROBE:
+		handle_probe(cmd);
+		free(cmd);
+		break;
+	case FIO_NET_CMD_START:
+		client->state = Client_started;
+		free(cmd);
+		break;
+	case FIO_NET_CMD_STOP:
+		client->state = Client_stopped;
+		free(cmd);
+		break;
+	default:
+		log_err("fio: unknown client op: %d\n", cmd->opcode);
+		free(cmd);
+		break;
 	}
 
-	return 0;
+	return 1;
 }
 
 int fio_handle_clients(void)
@@ -575,10 +694,14 @@ 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;
 			}
-			handle_client(client, 0);
+			if (!handle_client(client)) {
+				log_info("client: host=%s disconnected\n",
+						client->hostname);
+				remove_client(client);
+			}
 		}
 	}