server: rename CMD_RUN to CMD_SERVER_START

[fio.git] / client.c

diff --git a/client.c b/client.c
index 1c609b6b40ae55ceb9ac4a1e986b431acf705e3d..a77dc9350e0d1d57ffcc2c7f065204b3f9b5b254 100644 (file)
--- a/client.c
+++ b/client.c
@@ -22,18 +22,19 @@
 #include "hash.h"
 
 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_ts(struct fio_client *client, struct fio_net_cmd *cmd);
+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);
 
 struct client_ops fio_client_ops = {
        .text_op        = handle_text,
        .disk_util      = handle_du,
        .thread_status  = handle_ts,
        .group_stats    = handle_gs,
-       .eta            = handle_eta,
+       .stop           = handle_stop,
+       .eta            = display_thread_status,
        .probe          = handle_probe,
 };
 
@@ -53,9 +54,10 @@ static FLIST_HEAD(eta_list);
 
 static FLIST_HEAD(arg_list);
 
-static struct thread_stat client_ts;
-static struct group_run_stats client_gs;
-static int sum_stat_clients;
+struct thread_stat client_ts;
+struct group_run_stats client_gs;
+int sum_stat_clients;
+
 static int sum_stat_nr;
 
 #define FIO_CLIENT_HASH_BITS   7
@@ -94,8 +96,10 @@ static struct fio_client *find_client_by_fd(int fd)
        flist_for_each(entry, &client_hash[bucket]) {
                client = flist_entry(entry, struct fio_client, hash_list);
 
-               if (client->fd == fd)
+               if (client->fd == fd) {
+                       client->refs++;
                        return client;
+               }
        }
 
        return NULL;
@@ -103,6 +107,11 @@ static struct fio_client *find_client_by_fd(int fd)
 
 static void remove_client(struct fio_client *client)
 {
+       assert(client->refs);
+
+       if (--client->refs)
+               return;
+
        dprint(FD_NET, "client: removed <%s>\n", client->hostname);
        flist_del(&client->list);
 
@@ -110,7 +119,7 @@ static void remove_client(struct fio_client *client)
 
        if (!flist_empty(&client->eta_list)) {
                flist_del_init(&client->eta_list);
-               fio_client_dec_jobs_eta(client->eta_in_flight, display_thread_status);
+               fio_client_dec_jobs_eta(client->eta_in_flight, client->ops->eta);
        }
 
        free(client->hostname);
@@ -124,6 +133,11 @@ static void remove_client(struct fio_client *client)
        sum_stat_clients--;
 }
 
+static void put_client(struct fio_client *client)
+{
+       remove_client(client);
+}
+
 static void __fio_client_add_cmd_option(struct fio_client *client,
                                        const char *opt)
 {
@@ -155,7 +169,8 @@ void fio_client_add_cmd_option(void *cookie, const char *opt)
        }
 }
 
-struct fio_client *fio_client_add_explicit(const char *hostname, int type,
+struct fio_client *fio_client_add_explicit(struct client_ops *ops,
+                                          const char *hostname, int type,
                                           int port)
 {
        struct fio_client *client;
@@ -186,6 +201,8 @@ struct fio_client *fio_client_add_explicit(const char *hostname, int type,
        }
 
        client->fd = -1;
+       client->ops = ops;
+       client->refs = 1;
 
        __fio_client_add_cmd_option(client, "fio");
 
@@ -198,7 +215,7 @@ err:
        return NULL;
 }
 
-int fio_client_add(const char *hostname, void **cookie)
+int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie)
 {
        struct fio_client *existing = *cookie;
        struct fio_client *client;
@@ -233,6 +250,8 @@ int fio_client_add(const char *hostname, void **cookie)
                return -1;
 
        client->fd = -1;
+       client->ops = ops;
+       client->refs = 1;
 
        __fio_client_add_cmd_option(client, "fio");
 
@@ -619,7 +638,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
        dst->groupid    = le32_to_cpu(src->groupid);
 }
 
-static void handle_ts(struct fio_net_cmd *cmd)
+static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
 
@@ -640,7 +659,7 @@ static void handle_ts(struct fio_net_cmd *cmd)
        }
 }
 
-static void handle_gs(struct fio_net_cmd *cmd)
+static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
 
@@ -728,6 +747,7 @@ static void convert_jobs_eta(struct jobs_eta *je)
 
        je->elapsed_sec         = le64_to_cpu(je->elapsed_sec);
        je->eta_sec             = le64_to_cpu(je->eta_sec);
+       je->nr_threads          = le32_to_cpu(je->nr_threads);
 }
 
 void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
@@ -752,12 +772,15 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
 
        if (je->eta_sec > dst->eta_sec)
                dst->eta_sec = je->eta_sec;
+
+       dst->nr_threads         += je->nr_threads;
+       /* we need to handle je->run_str too ... */
 }
 
-void fio_client_dec_jobs_eta(struct client_eta *eta, void (*fn)(struct jobs_eta *))
+void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn)
 {
        if (!--eta->pending) {
-               fn(&eta->eta);
+               eta_fn(&eta->eta);
                free(eta);
        }
 }
@@ -799,7 +822,7 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
        flist_del_init(&client->eta_list);
 
        fio_client_sum_jobs_eta(&eta->eta, je);
-       fio_client_dec_jobs_eta(eta, display_thread_status);
+       fio_client_dec_jobs_eta(eta, client->ops->eta);
 }
 
 static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
@@ -836,15 +859,17 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
 
 static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
 {
-       struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
-
-       client->state = Client_stopped;
-       client->error = le32_to_cpu(pdu->error);
-
        if (client->error)
                log_info("client <%s>: exited with error %d\n", client->hostname, client->error);
 }
 
+static void convert_stop(struct fio_net_cmd *cmd)
+{
+       struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
+
+       pdu->error = le32_to_cpu(pdu->error);
+}
+
 static void convert_text(struct fio_net_cmd *cmd)
 {
        struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmd->payload;
@@ -855,8 +880,9 @@ static void convert_text(struct fio_net_cmd *cmd)
        pdu->log_usec   = le64_to_cpu(pdu->log_usec);
 }
 
-int fio_handle_client(struct fio_client *client, struct client_ops *ops)
+int fio_handle_client(struct fio_client *client)
 {
+       struct client_ops *ops = client->ops;
        struct fio_net_cmd *cmd;
 
        dprint(FD_NET, "client: handle %s\n", client->hostname);
@@ -896,7 +922,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
                convert_ts(&p->ts, &p->ts);
                convert_gs(&p->rs, &p->rs);
 
-               ops->thread_status(cmd);
+               ops->thread_status(client, cmd);
                free(cmd);
                break;
                }
@@ -905,7 +931,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
 
                convert_gs(gs, gs);
 
-               ops->group_stats(cmd);
+               ops->group_stats(client, cmd);
                free(cmd);
                break;
                }
@@ -914,7 +940,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
 
                remove_reply_cmd(client, cmd);
                convert_jobs_eta(je);
-               ops->eta(client, cmd);
+               handle_eta(client, cmd);
                free(cmd);
                break;
                }
@@ -923,7 +949,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
                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;
@@ -931,10 +957,16 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
                handle_start(client, cmd);
                free(cmd);
                break;
-       case FIO_NET_CMD_STOP:
-               handle_stop(client, cmd);
+       case FIO_NET_CMD_STOP: {
+               struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
+
+               convert_stop(cmd);
+               client->state = Client_stopped;
+               client->error = pdu->error;
+               ops->stop(client, cmd);
                free(cmd);
                break;
+               }
        case FIO_NET_CMD_ADD_JOB:
                if (ops->add_job)
                        ops->add_job(client, cmd);
@@ -949,7 +981,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops)
        return 1;
 }
 
-static void request_client_etas(void)
+static void request_client_etas(struct client_ops *ops)
 {
        struct fio_client *client;
        struct flist_head *entry;
@@ -980,7 +1012,7 @@ static void request_client_etas(void)
        }
 
        while (skipped--)
-               fio_client_dec_jobs_eta(eta, display_thread_status);
+               fio_client_dec_jobs_eta(eta, ops->eta);
 
        dprint(FD_NET, "client: requested eta tag %p\n", eta);
 }
@@ -1008,7 +1040,7 @@ static int client_check_cmd_timeout(struct fio_client *client,
        return flist_empty(&client->cmd_list) && ret;
 }
 
-static int fio_client_timed_out(struct client_ops *ops)
+static int fio_check_clients_timed_out(void)
 {
        struct fio_client *client;
        struct flist_head *entry, *tmp;
@@ -1026,8 +1058,8 @@ static int fio_client_timed_out(struct client_ops *ops)
                if (!client_check_cmd_timeout(client, &tv))
                        continue;
 
-               if (ops->timed_out)
-                       ops->timed_out(client);
+               if (client->ops->timed_out)
+                       client->ops->timed_out(client);
                else
                        log_err("fio: client %s timed out\n", client->hostname);
 
@@ -1059,7 +1091,7 @@ int fio_handle_clients(struct client_ops *ops)
                flist_for_each_safe(entry, tmp, &client_list) {
                        client = flist_entry(entry, struct fio_client, list);
 
-                       if (!client->sent_job && !ops->stay_connected &&
+                       if (!client->sent_job && !client->ops->stay_connected &&
                            flist_empty(&client->cmd_list)) {
                                remove_client(client);
                                continue;
@@ -1080,10 +1112,10 @@ int fio_handle_clients(struct client_ops *ops)
 
                        gettimeofday(&tv, NULL);
                        if (mtime_since(&eta_tv, &tv) >= 900) {
-                               request_client_etas();
+                               request_client_etas(ops);
                                memcpy(&eta_tv, &tv, sizeof(tv));
 
-                               if (fio_client_timed_out(ops))
+                               if (fio_check_clients_timed_out())
                                        break;
                        }
 
@@ -1106,13 +1138,14 @@ int fio_handle_clients(struct client_ops *ops)
                                log_err("fio: unknown client fd %d\n", pfds[i].fd);
                                continue;
                        }
-                       if (!fio_handle_client(client, ops)) {
+                       if (!fio_handle_client(client)) {
                                log_info("client: host=%s disconnected\n",
                                                client->hostname);
                                remove_client(client);
                                retval = 1;
                        } else if (client->error)
                                retval = 1;
+                       put_client(client);
                }
        }