X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=c794d9b1495d14c83eb8ec4f8ba7f70251552791;hb=f3074008948b51ec380b4f06791ceec89a40d8a6;hp=ace70d357b97a3e882bacfea811e265779a85b44;hpb=93bcfd20e37cef8cec350fe06d3a086724c9f257;p=fio.git

diff --git a/client.c b/client.c
index ace70d35..c794d9b1 100644
--- a/client.c
+++ b/client.c
@@ -16,6 +16,7 @@
 #include <signal.h>
 
 #include "fio.h"
+#include "client.h"
 #include "server.h"
 #include "flist.h"
 #include "hash.h"
@@ -48,6 +49,7 @@ struct fio_client {
 	unsigned int jobs;
 	int error;
 	int ipv6;
+	int sent_job;
 
 	struct flist_head eta_list;
 	struct client_eta *eta_in_flight;
@@ -58,6 +60,36 @@ struct fio_client {
 	char **argv;
 };
 
+static void fio_client_text_op(struct fio_client *client,
+		FILE *f, __u16 pdu_len, const char *buf)
+{
+	const char *name;
+	int fio_unused ret;
+
+	name = client->name ? client->name : client->hostname;
+
+	if (!client->skip_newline)
+		fprintf(f, "<%s> ", name);
+	ret = fwrite(buf, pdu_len, 1, f);
+	fflush(f);
+	client->skip_newline = strchr(buf, '\n') == NULL;
+}
+
+static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd);
+static void handle_ts(struct fio_net_cmd *cmd);
+static void handle_gs(struct fio_net_cmd *cmd);
+static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd);
+static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd);
+
+struct client_ops fio_client_ops = {
+	fio_client_text_op,
+	handle_du,
+	handle_ts,
+	handle_gs,
+	handle_eta,
+	handle_probe,
+};
+
 static struct timeval eta_tv;
 
 enum {
@@ -84,7 +116,7 @@ static int sum_stat_nr;
 #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 int handle_client(struct fio_client *client, struct client_ops *ops);
 static void dec_jobs_eta(struct client_eta *eta);
 
 static void fio_client_add_hash(struct fio_client *client)
@@ -481,6 +513,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);
@@ -497,6 +530,8 @@ int fio_clients_send_ini(const char *filename)
 
 		if (fio_client_send_ini(client, filename))
 			remove_client(client);
+
+		client->sent_job = 1;
 	}
 
 	return !nr_clients;
@@ -815,7 +850,7 @@ static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
 		log_info("client <%s>: exited with error %d\n", client->hostname, client->error);
 }
 
-static int handle_client(struct fio_client *client)
+static int handle_client(struct fio_client *client, struct client_ops *ops)
 {
 	struct fio_net_cmd *cmd;
 
@@ -835,39 +870,30 @@ 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> ", name);
-		ret = fwrite(buf, cmd->pdu_len, 1, f_out);
-		fflush(f_out);
-		client->skip_newline = strchr(buf, '\n') == NULL;
+		ops->text_op(client, f_out, cmd->pdu_len, buf);
 		free(cmd);
 		break;
 		}
 	case FIO_NET_CMD_DU:
-		handle_du(client, cmd);
+		ops->disk_util(client, cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_TS:
-		handle_ts(cmd);
+		ops->thread_status(cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_GS:
-		handle_gs(cmd);
+		ops->group_stats(cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_ETA:
 		remove_reply_cmd(client, cmd);
-		handle_eta(client, cmd);
+		ops->eta(client, cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_PROBE:
 		remove_reply_cmd(client, cmd);
-		handle_probe(client, cmd);
+		ops->probe(client, cmd);
 		free(cmd);
 		break;
 	case FIO_NET_CMD_RUN:
@@ -976,10 +1002,8 @@ static int fio_client_timed_out(void)
 	return ret;
 }
 
-int fio_handle_clients(void)
+int fio_handle_clients(struct client_ops *ops)
 {
-	struct fio_client *client;
-	struct flist_head *entry;
 	struct pollfd *pfds;
 	int i, ret = 0, retval = 0;
 
@@ -992,15 +1016,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 {
@@ -1034,7 +1070,7 @@ int fio_handle_clients(void)
 				log_err("fio: unknown client fd %d\n", pfds[i].fd);
 				continue;
 			}
-			if (!handle_client(client)) {
+			if (!handle_client(client, ops)) {
 				log_info("client: host=%s disconnected\n",
 						client->hostname);
 				remove_client(client);