client/server: pass type of client to the backend

[fio.git] / client.c

diff --git a/client.c b/client.c
index 5545a8a90a9982f87af5ca73515daaf848a5c1b1..6371c2be8d9e05592864ae8168af0571f470fe2f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -27,16 +27,19 @@ 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,
+       .text           = handle_text,
        .disk_util      = handle_du,
        .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,
+       .client_type    = FIO_CLIENT_TYPE_CLI,
 };
 
 static struct timeval eta_tv;
@@ -88,22 +91,37 @@ 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)
-                       return fio_get_client(client);
+               if (client->fd == fd) {
+                       client->refs++;
+                       return client;
+               }
        }
 
        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 +130,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)
@@ -199,6 +207,7 @@ struct fio_client *fio_client_add_explicit(struct client_ops *ops,
        client->fd = -1;
        client->ops = ops;
        client->refs = 1;
+       client->type = ops->client_type;
 
        __fio_client_add_cmd_option(client, "fio");
 
@@ -248,6 +257,7 @@ int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie)
        client->fd = -1;
        client->ops = ops;
        client->refs = 1;
+       client->type = ops->client_type;
 
        __fio_client_add_cmd_option(client, "fio");
 
@@ -441,6 +451,7 @@ static int send_client_cmd_line(struct fio_client *client)
 
        free(lens);
        clp->lines = cpu_to_le16(client->argc);
+       clp->client_type = __cpu_to_le16(client->type);
        ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, 0);
        free(pdu);
        return ret;
@@ -510,8 +521,11 @@ int fio_start_all_clients(void)
  */
 static int __fio_client_send_ini(struct fio_client *client, const char *filename)
 {
+       struct cmd_job_pdu *pdu;
+       size_t p_size;
        struct stat sb;
-       char *p, *buf;
+       char *p;
+       void *buf;
        off_t len;
        int fd, ret;
 
@@ -533,7 +547,9 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename
                return ret;
        }
 
-       buf = malloc(sb.st_size);
+       p_size = sb.st_size + sizeof(*pdu);
+       pdu = malloc(p_size);
+       buf = pdu->buf;
 
        len = sb.st_size;
        p = buf;
@@ -558,9 +574,12 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename
                return 1;
        }
 
+       pdu->buf_len = __cpu_to_le32(sb.st_size);
+       pdu->client_type = cpu_to_le32(client->type);
+
        client->sent_job = 1;
-       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size, 0);
-       free(buf);
+       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, pdu, p_size, 0);
+       free(pdu);
        close(fd);
        return ret;
 }
@@ -570,12 +589,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 +603,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 +924,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)
@@ -950,13 +967,13 @@ int fio_handle_client(struct fio_client *client)
        switch (cmd->opcode) {
        case FIO_NET_CMD_QUIT:
                if (ops->quit)
-                       ops->quit(client);
+                       ops->quit(client, cmd);
                remove_client(client);
                free(cmd);
                break;
        case FIO_NET_CMD_TEXT:
                convert_text(cmd);
-               ops->text_op(client, cmd);
+               ops->text(client, cmd);
                free(cmd);
                break;
        case FIO_NET_CMD_DU: {
@@ -1004,12 +1021,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;