X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=b632241aec791d57aaa18df4427538c635a2cb6d;hp=459c300b18fe73b77dfc1f5f912647e46c949915;hb=9abea48bee7340fdf0aee00fa734a3071d47ed86;hpb=a450e4924ad4ae4a05015e55cb54c78fb0c5015f

diff --git a/client.c b/client.c
index 459c300b..b632241a 100644
--- a/client.c
+++ b/client.c
@@ -23,10 +23,25 @@ struct fio_client {
 	struct sockaddr_in addr;
 	char *hostname;
 	int fd;
+
+	int state;
+
+	uint16_t argc;
+	char **argv;
+};
+
+enum {
+	Client_created		= 0,
+	Client_connected	= 1,
+	Client_started		= 2,
+	Client_stopped		= 3,
+	Client_exited		= 4,
 };
 
 static FLIST_HEAD(client_list);
 
+static int handle_client(struct fio_client *client, int one);
+
 static struct fio_client *find_client_by_fd(int fd)
 {
 	struct fio_client *client;
@@ -42,7 +57,6 @@ static struct fio_client *find_client_by_fd(int fd)
 	return NULL;
 }
 
-#if 0
 static struct fio_client *find_client_by_name(const char *name)
 {
 	struct fio_client *client;
@@ -57,17 +71,44 @@ static struct fio_client *find_client_by_name(const char *name)
 
 	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);
+	if (client->argv)
+		free(client->argv);
+
 	free(client);
 }
 
+static void __fio_client_add_cmd_option(struct fio_client *client,
+					const char *opt)
+{
+	client->argc++;
+	client->argv = realloc(client->argv, sizeof(char *) * client->argc);
+	client->argv[client->argc - 1] = strdup(opt);
+}
+
+void fio_client_add_cmd_option(const char *hostname, const char *opt)
+{
+	struct fio_client *client;
+
+	if (!hostname || !opt)
+		return;
+
+	client = find_client_by_name(hostname);
+	if (!client) {
+		log_err("fio: unknown client %s\n", hostname);
+		return;
+	}
+
+	__fio_client_add_cmd_option(client, opt);
+}
+
 void fio_client_add(const char *hostname)
 {
 	struct fio_client *client;
@@ -75,8 +116,12 @@ void fio_client_add(const char *hostname)
 	dprint(FD_NET, "added client <%s>\n", hostname);
 	client = malloc(sizeof(*client));
 	memset(client, 0, sizeof(*client));
+
 	client->hostname = strdup(hostname);
 	client->fd = -1;
+
+	__fio_client_add_cmd_option(client, "fio");
+
 	flist_add(&client->list, &client_list);
 	nr_clients++;
 }
@@ -111,35 +156,94 @@ static int fio_client_connect(struct fio_client *client)
 
 	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;
 	}
 
 	client->fd = fd;
+	client->state = Client_connected;
 	return 0;
 }
 
+void fio_clients_terminate(void)
+{
+	struct flist_head *entry;
+	struct fio_client *client;
+
+	flist_for_each(entry, &client_list) {
+		client = flist_entry(entry, struct fio_client, list);
+
+		fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_QUIT, 0);
+	}
+}
+
+static void sig_int(int sig)
+{
+	fio_clients_terminate();
+}
+
+static void client_signal_handler(void)
+{
+	struct sigaction act;
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_int;
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGINT, &act, NULL);
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sig_int;
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGTERM, &act, NULL);
+}
+
+static void probe_client(struct fio_client *client)
+{
+	fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
+	handle_client(client, 1);
+}
+
+static int send_client_cmd_line(struct fio_client *client)
+{
+	struct cmd_line_pdu *pdu;
+	int i, ret;
+
+	pdu = malloc(sizeof(*pdu));
+	for (i = 0; i < client->argc; i++)
+		strcpy((char *) pdu->argv[i], client->argv[i]);
+
+	pdu->argc = cpu_to_le16(client->argc);
+	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu));
+	free(pdu);
+	return ret;
+}
+
 int fio_clients_connect(void)
 {
 	struct fio_client *client;
 	struct flist_head *entry, *tmp;
 	int ret;
 
+	client_signal_handler();
+
 	flist_for_each_safe(entry, tmp, &client_list) {
 		client = flist_entry(entry, struct fio_client, list);
 
 		ret = fio_client_connect(client);
-		if (ret)
+		if (ret) {
 			remove_client(client);
+			continue;
+		}
+
+		probe_client(client);
+
+		if (client->argc > 1)
+			send_client_cmd_line(client);
 	}
 
 	return !nr_clients;
 }
 
-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.
@@ -182,7 +286,12 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
 			continue;
 	} while (1);
 
-	ret = send_file_buf(client, buf, sb.st_size);
+	if (len) {
+		log_err("fio: failed reading job file %s\n", filename);
+		return 1;
+	}
+
+	ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
 	free(buf);
 	return ret;
 }
@@ -208,8 +317,8 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
 	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);
+	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)
@@ -253,7 +362,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
 
 	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->short_io_u[i]	= le64_to_cpu(src->short_io_u[i]);
 	}
 
 	dst->total_submit	= le64_to_cpu(src->total_submit);
@@ -267,8 +376,8 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
 	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	= le64_to_cpu(src->first_error);
-	dst->kb_base		= le64_to_cpu(src->kb_base);
+	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)
@@ -306,27 +415,58 @@ static void handle_gs(struct fio_net_cmd *cmd)
 	show_group_stats(gs);
 }
 
-static int handle_client(struct fio_client *client)
+static void handle_eta(struct fio_net_cmd *cmd)
+{
+	struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
+	int i;
+
+	je->nr_running		= le32_to_cpu(je->nr_running);
+	je->nr_ramp		= le32_to_cpu(je->nr_ramp);
+	je->nr_pending		= le32_to_cpu(je->nr_pending);
+	je->files_open		= le32_to_cpu(je->files_open);
+	je->m_rate		= le32_to_cpu(je->m_rate);
+	je->t_rate		= le32_to_cpu(je->t_rate);
+	je->m_iops		= le32_to_cpu(je->m_iops);
+	je->t_iops		= le32_to_cpu(je->t_iops);
+
+	for (i = 0; i < 2; i++) {
+		je->rate[i]	= le32_to_cpu(je->rate[i]);
+		je->iops[i]	= le32_to_cpu(je->iops[i]);
+	}
+
+	je->elapsed_sec		= le32_to_cpu(je->nr_running);
+	je->eta_sec		= le64_to_cpu(je->eta_sec);
+
+	display_thread_status(je);
+}
+
+static void handle_probe(struct fio_net_cmd *cmd)
+{
+	struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
+
+	log_info("Probe: hostname=%s, fio ver %u.%u.%u\n", probe->hostname,
+			probe->fio_major, probe->fio_minor, probe->fio_patch);
+}
+
+static int handle_client(struct fio_client *client, int one)
 {
 	struct fio_net_cmd *cmd;
 	int done = 0;
 
-	while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
+	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_ACK:
-			free(cmd);
-			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);
+			fprintf(f_out, "Client <%s>: ", client->hostname);
+			fwrite(cmd->payload, cmd->pdu_len, 1, f_out);
+			fflush(f_out);
 			free(cmd);
 			break;
 		case FIO_NET_CMD_TS:
@@ -337,13 +477,29 @@ static int handle_client(struct fio_client *client)
 			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;
 		}
 
-		if (done)
+		if (done || one)
 			break;
 	}
 
@@ -371,14 +527,16 @@ int fio_handle_clients(void)
 
 		assert(i == nr_clients);
 
-		ret = poll(pfds, nr_clients, 100);
-		if (ret < 0) {
-			if (errno == EINTR)
+		do {
+			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;
-			log_err("fio: poll clients: %s\n", strerror(errno));
-			break;
-		} else if (!ret)
-			continue;
+		} while (ret <= 0);
 
 		for (i = 0; i < nr_clients; i++) {
 			if (!(pfds[i].revents & POLLIN))
@@ -389,7 +547,7 @@ int fio_handle_clients(void)
 				log_err("fio: unknown client\n");
 				continue;
 			}
-			handle_client(client);
+			handle_client(client, 0);
 		}
 	}