X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=5545a8a90a9982f87af5ca73515daaf848a5c1b1;hp=f9a160261a955118f75f60f6c701f58c748a8b63;hb=7175d91deff20b1408450c231b2b445ea28f7f29;hpb=343cb4a98200757bdcb0c5203e9120bb777625a8

diff --git a/client.c b/client.c
index f9a16026..5545a8a9 100644
--- a/client.c
+++ b/client.c
@@ -36,6 +36,7 @@ struct client_ops fio_client_ops = {
 	.stop		= handle_stop,
 	.eta		= display_thread_status,
 	.probe		= handle_probe,
+	.eta_msec	= FIO_CLIENT_DEF_ETA_MSEC,
 };
 
 static struct timeval eta_tv;
@@ -257,6 +258,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;
@@ -347,6 +355,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;
 }
 
@@ -389,13 +399,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;
@@ -467,8 +470,6 @@ int fio_clients_connect(void)
 			continue;
 		}
 
-		probe_client(client);
-
 		if (client->argc > 1)
 			send_client_cmd_line(client);
 	}
@@ -1163,7 +1164,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));