X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=e64b3f08e8a8b88be4b95ca665dedd4d66e776b8;hb=e476994eed3bee246ca166ea6ad6018911408e9b;hp=98c8b28b8e67a9ab3e332c5981ba5cbad6bc51c9;hpb=a1a3ed5143e7fe153d114f9ff96bfbc5dc14a156;p=fio.git

diff --git a/client.c b/client.c
index 98c8b28b..e64b3f08 100644
--- a/client.c
+++ b/client.c
@@ -27,6 +27,7 @@ static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd);
 static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd);
 static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd);
 static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd);
+static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd);
 
 struct client_ops fio_client_ops = {
 	.text_op	= handle_text,
@@ -34,8 +35,10 @@ struct client_ops fio_client_ops = {
 	.thread_status	= handle_ts,
 	.group_stats	= handle_gs,
 	.stop		= handle_stop,
+	.start		= handle_start,
 	.eta		= display_thread_status,
 	.probe		= handle_probe,
+	.eta_msec	= FIO_CLIENT_DEF_ETA_MSEC,
 };
 
 static struct timeval eta_tv;
@@ -96,15 +99,28 @@ static struct fio_client *find_client_by_fd(int fd)
 	return NULL;
 }
 
-static void remove_client(struct fio_client *client)
+void fio_put_client(struct fio_client *client)
 {
-	assert(client->refs);
-
 	if (--client->refs)
 		return;
 
+	free(client->hostname);
+	if (client->argv)
+		free(client->argv);
+	if (client->name)
+		free(client->name);
+
+	free(client);
+}
+
+static void remove_client(struct fio_client *client)
+{
+	assert(client->refs);
+
 	dprint(FD_NET, "client: removed <%s>\n", client->hostname);
-	flist_del(&client->list);
+
+	if (!flist_empty(&client->list))
+		flist_del_init(&client->list);
 
 	fio_client_remove_hash(client);
 
@@ -113,20 +129,16 @@ static void remove_client(struct fio_client *client)
 		fio_client_dec_jobs_eta(client->eta_in_flight, client->ops->eta);
 	}
 
-	free(client->hostname);
-	if (client->argv)
-		free(client->argv);
-	if (client->name)
-		free(client->name);
-
-	free(client);
 	nr_clients--;
 	sum_stat_clients--;
+
+	fio_put_client(client);
 }
 
-static void put_client(struct fio_client *client)
+struct fio_client *fio_get_client(struct fio_client *client)
 {
-	remove_client(client);
+	client->refs++;
+	return client;
 }
 
 static void __fio_client_add_cmd_option(struct fio_client *client,
@@ -253,6 +265,13 @@ int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie)
 	return 0;
 }
 
+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, &client->cmd_list);
+}
+
 static int fio_client_connect_ip(struct fio_client *client)
 {
 	struct sockaddr *addr;
@@ -275,16 +294,20 @@ static int fio_client_connect_ip(struct fio_client *client)
 
 	fd = socket(domain, SOCK_STREAM, 0);
 	if (fd < 0) {
+		int ret = -errno;
+
 		log_err("fio: socket: %s\n", strerror(errno));
-		return -errno;
+		return ret;
 	}
 
 	if (connect(fd, addr, socklen) < 0) {
+		int ret = -errno;
+
 		log_err("fio: connect: %s\n", strerror(errno));
 		log_err("fio: failed to connect to %s:%u\n", client->hostname,
 								client->port);
 		close(fd);
-		return -errno;
+		return ret;
 	}
 
 	return fd;
@@ -302,15 +325,19 @@ static int fio_client_connect_sock(struct fio_client *client)
 
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
+		int ret = -errno;
+
 		log_err("fio: socket: %s\n", strerror(errno));
-		return -errno;
+		return ret;
 	}
 
 	len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1;
 	if (connect(fd, (struct sockaddr *) addr, len) < 0) {
+		int ret = -errno;
+
 		log_err("fio: connect; %s\n", strerror(errno));
 		close(fd);
-		return -errno;
+		return ret;
 	}
 
 	return fd;
@@ -335,6 +362,8 @@ int fio_client_connect(struct fio_client *client)
 	client->fd = fd;
 	fio_client_add_hash(client);
 	client->state = Client_connected;
+
+	probe_client(client);
 	return 0;
 }
 
@@ -377,13 +406,6 @@ static void client_signal_handler(void)
 	sigaction(SIGTERM, &act, NULL);
 }
 
-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, &client->cmd_list);
-}
-
 static int send_client_cmd_line(struct fio_client *client)
 {
 	struct cmd_single_line_pdu *cslp;
@@ -455,8 +477,6 @@ int fio_clients_connect(void)
 			continue;
 		}
 
-		probe_client(client);
-
 		if (client->argc > 1)
 			send_client_cmd_line(client);
 	}
@@ -506,14 +526,18 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
+		int ret = -errno;
+
 		log_err("fio: job file <%s> open: %s\n", filename, strerror(errno));
-		return 1;
+		return ret;
 	}
 
 	if (fstat(fd, &sb) < 0) {
+		int ret = -errno;
+
 		log_err("fio: job file stat: %s\n", strerror(errno));
 		close(fd);
-		return 1;
+		return ret;
 	}
 
 	buf = malloc(sb.st_size);
@@ -550,13 +574,13 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename
 
 int fio_client_send_ini(struct fio_client *client, const char *filename)
 {
-	if (__fio_client_send_ini(client, filename)) {
-		remove_client(client);
-		return 1;
-	}
+	int ret;
 
-	client->sent_job = 1;
-	return 0;
+	ret = __fio_client_send_ini(client, filename);
+	if (!ret)
+		client->sent_job = 1;
+
+	return ret;
 }
 
 int fio_clients_send_ini(const char *filename)
@@ -567,7 +591,8 @@ int fio_clients_send_ini(const char *filename)
 	flist_for_each_safe(entry, tmp, &client_list) {
 		client = flist_entry(entry, struct fio_client, list);
 
-		fio_client_send_ini(client, filename);
+		if (fio_client_send_ini(client, filename))
+			remove_client(client);
 	}
 
 	return !nr_clients;
@@ -887,7 +912,7 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
 	struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload;
 
 	client->state = Client_started;
-	client->jobs = le32_to_cpu(pdu->jobs);
+	client->jobs = pdu->jobs;
 }
 
 static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
@@ -984,12 +1009,18 @@ int fio_handle_client(struct fio_client *client)
 		break;
 	case FIO_NET_CMD_SERVER_START:
 		client->state = Client_running;
+		if (ops->job_start)
+			ops->job_start(client, cmd);
 		free(cmd);
 		break;
-	case FIO_NET_CMD_START:
-		handle_start(client, cmd);
+	case FIO_NET_CMD_START: {
+		struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload;
+
+		pdu->jobs = le32_to_cpu(pdu->jobs);
+		ops->start(client, cmd);
 		free(cmd);
 		break;
+		}
 	case FIO_NET_CMD_STOP: {
 		struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
 
@@ -1144,7 +1175,7 @@ int fio_handle_clients(struct client_ops *ops)
 			struct timeval tv;
 
 			gettimeofday(&tv, NULL);
-			if (mtime_since(&eta_tv, &tv) >= 900) {
+			if (mtime_since(&eta_tv, &tv) >= ops->eta_msec) {
 				request_client_etas(ops);
 				memcpy(&eta_tv, &tv, sizeof(tv));
 
@@ -1178,7 +1209,7 @@ int fio_handle_clients(struct client_ops *ops)
 				retval = 1;
 			} else if (client->error)
 				retval = 1;
-			put_client(client);
+			fio_put_client(client);
 		}
 	}