Client reference fixes

[fio.git] / client.c

diff --git a/client.c b/client.c
index 5545a8a90a9982f87af5ca73515daaf848a5c1b1..0da4f47a5b24f7eea6d9f2f2613c2ef2005c1ccc 100644 (file)
--- 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,6 +35,7 @@ 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,
@@ -95,15 +97,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);
 
@@ -112,20 +127,10 @@ 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--;
-}
 
-void fio_put_client(struct fio_client *client)
-{
-       remove_client(client);
+       fio_put_client(client);
 }
 
 struct fio_client *fio_get_client(struct fio_client *client)
@@ -570,12 +575,9 @@ int fio_client_send_ini(struct fio_client *client, const char *filename)
        int ret;
 
        ret = __fio_client_send_ini(client, filename);
-       if (ret) {
-               remove_client(client);
-               return ret;
-       }
+       if (!ret)
+               client->sent_job = 1;
 
-       client->sent_job = 1;
        return ret;
 }
 
@@ -587,7 +589,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;
@@ -907,7 +910,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)
@@ -1004,12 +1007,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;