client: send probe from fio_client_connect()
authorJens Axboe <axboe@kernel.dk>
Fri, 9 Mar 2012 16:45:43 +0000 (17:45 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 9 Mar 2012 16:45:43 +0000 (17:45 +0100)
We only do it from fio_clients_connect() now, better move it
into the lower per-client handler. This gets probes working
with gfio again.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
client.c

index f9a160261a955118f75f60f6c701f58c748a8b63..df603f7e22ab11f6aacab53d2e08446aadeb2782 100644 (file)
--- a/client.c
+++ b/client.c
@@ -257,6 +257,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 +354,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 +398,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 +469,6 @@ int fio_clients_connect(void)
                        continue;
                }
 
-               probe_client(client);
-
                if (client->argc > 1)
                        send_client_cmd_line(client);
        }