gfio: handle clients individually

[fio.git] / client.c

diff --git a/client.c b/client.c
index 3adddc02f3777d462662b755b298bc50c871d16c..225f6643e5aaa0ec283f35f8903415789debb3b7 100644 (file)
--- a/client.c
+++ b/client.c
@@ -40,15 +40,6 @@ struct client_ops fio_client_ops = {
 
 static struct timeval eta_tv;
 
-enum {
-       Client_created          = 0,
-       Client_connected        = 1,
-       Client_started          = 2,
-       Client_running          = 3,
-       Client_stopped          = 4,
-       Client_exited           = 5,
-};
-
 static FLIST_HEAD(client_list);
 static FLIST_HEAD(eta_list);
 
@@ -325,7 +316,7 @@ static int fio_client_connect_sock(struct fio_client *client)
        return fd;
 }
 
-static int fio_client_connect(struct fio_client *client)
+int fio_client_connect(struct fio_client *client)
 {
        int fd;
 
@@ -347,6 +338,11 @@ static int fio_client_connect(struct fio_client *client)
        return 0;
 }
 
+void fio_client_terminate(struct fio_client *client)
+{
+       fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_QUIT, 0, NULL);
+}
+
 void fio_clients_terminate(void)
 {
        struct flist_head *entry;
@@ -356,8 +352,7 @@ void fio_clients_terminate(void)
 
        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, NULL);
+               fio_client_terminate(client);
        }
 }
 
@@ -469,11 +464,38 @@ int fio_clients_connect(void)
        return !nr_clients;
 }
 
+int fio_start_client(struct fio_client *client)
+{
+       dprint(FD_NET, "client: start %s\n", client->hostname);
+       return fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_RUN, 0, NULL);
+}
+
+int fio_start_all_clients(void)
+{
+       struct fio_client *client;
+       struct flist_head *entry, *tmp;
+       int ret;
+
+       dprint(FD_NET, "client: start all\n");
+
+       flist_for_each_safe(entry, tmp, &client_list) {
+               client = flist_entry(entry, struct fio_client, list);
+
+               ret = fio_start_client(client);
+               if (ret) {
+                       remove_client(client);
+                       continue;
+               }
+       }
+
+       return flist_empty(&client_list);
+}
+
 /*
  * Send file contents to server backend. We could use sendfile(), but to remain
  * more portable lets just read/write the darn thing.
  */
-static int fio_client_send_ini(struct fio_client *client, const char *filename)
+static int __fio_client_send_ini(struct fio_client *client, const char *filename)
 {
        struct stat sb;
        char *p, *buf;
@@ -526,6 +548,17 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
        return ret;
 }
 
+int fio_client_send_ini(struct fio_client *client, const char *filename)
+{
+       if (__fio_client_send_ini(client, filename)) {
+               remove_client(client);
+               return 1;
+       }
+
+       client->sent_job = 1;
+       return 0;
+}
+
 int fio_clients_send_ini(const char *filename)
 {
        struct fio_client *client;
@@ -534,10 +567,7 @@ int fio_clients_send_ini(const char *filename)
        flist_for_each_safe(entry, tmp, &client_list) {
                client = flist_entry(entry, struct fio_client, list);
 
-               if (fio_client_send_ini(client, filename))
-                       remove_client(client);
-
-               client->sent_job = 1;
+               fio_client_send_ini(client, filename);
        }
 
        return !nr_clients;
@@ -821,6 +851,9 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
        client->eta_in_flight = NULL;
        flist_del_init(&client->eta_list);
 
+       if (client->ops->jobs_eta)
+               client->ops->jobs_eta(client, je);
+
        fio_client_sum_jobs_eta(&eta->eta, je);
        fio_client_dec_jobs_eta(eta, client->ops->eta);
 }
@@ -891,8 +924,8 @@ int fio_handle_client(struct fio_client *client)
        if (!cmd)
                return 0;
 
-       dprint(FD_NET, "client: got cmd op %s from %s\n",
-                               fio_server_op(cmd->opcode), client->hostname);
+       dprint(FD_NET, "client: got cmd op %s from %s (pdu=%u)\n",
+               fio_server_op(cmd->opcode), client->hostname, cmd->pdu_len);
 
        switch (cmd->opcode) {
        case FIO_NET_CMD_QUIT:
@@ -949,7 +982,7 @@ int fio_handle_client(struct fio_client *client)
                ops->probe(client, cmd);
                free(cmd);
                break;
-       case FIO_NET_CMD_RUN:
+       case FIO_NET_CMD_SERVER_START:
                client->state = Client_running;
                free(cmd);
                break;