Add protocol support for an arbitrary number of command line arguments

[fio.git] / client.c

diff --git a/client.c b/client.c
index 9caefbb86a6a8d48debbe369de310a832a847185..874f0aecd3b80ccd1b8bed646be783410a4e99e0 100644 (file)
--- a/client.c
+++ b/client.c
@@ -29,6 +29,8 @@ struct fio_client {
        int port;
        int fd;
 
+       char *name;
+
        int state;
        int skip_newline;
        int is_sock;
@@ -102,37 +104,32 @@ static void remove_client(struct fio_client *client)
        free(client->hostname);
        if (client->argv)
                free(client->argv);
+       if (client->name)
+               free(client->name);
 
        free(client);
        nr_clients--;
 }
 
-static int __fio_client_add_cmd_option(struct fio_client *client,
-                                      const char *opt)
+static void __fio_client_add_cmd_option(struct fio_client *client,
+                                       const char *opt)
 {
        int index;
 
-       if (client->argc == FIO_NET_CMD_JOBLINE_ARGV) {
-               log_err("fio: max cmd line number reached.\n");
-               log_err("fio: cmd line <%s> has been ignored.\n", opt);
-               return 1;
-       }
-
        index = client->argc++;
        client->argv = realloc(client->argv, sizeof(char *) * client->argc);
        client->argv[index] = strdup(opt);
        dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
-       return 0;
 }
 
-int fio_client_add_cmd_option(void *cookie, const char *opt)
+void fio_client_add_cmd_option(void *cookie, const char *opt)
 {
        struct fio_client *client = cookie;
 
        if (!client || !opt)
-               return 0;
+               return;
 
-       return __fio_client_add_cmd_option(client, opt);
+       __fio_client_add_cmd_option(client, opt);
 }
 
 int fio_client_add(const char *hostname, void **cookie)
@@ -276,17 +273,41 @@ static void probe_client(struct fio_client *client)
 
 static int send_client_cmd_line(struct fio_client *client)
 {
-       struct cmd_line_pdu *pdu;
+       struct cmd_single_line_pdu *cslp;
+       struct cmd_line_pdu *clp;
+       unsigned long offset;
+       void *pdu;
+       size_t mem;
        int i, ret;
 
        dprint(FD_NET, "client: send cmdline %d\n", client->argc);
 
-       pdu = malloc(sizeof(*pdu));
-       for (i = 0; i < client->argc; i++)
-               strcpy((char *) pdu->argv[i], client->argv[i]);
+       /*
+        * Find out how much mem we need
+        */
+       for (i = 0, mem = 0; i < client->argc; i++)
+               mem += strlen(client->argv[i]) + 1;
 
-       pdu->argc = cpu_to_le16(client->argc);
-       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu));
+       /*
+        * We need one cmd_line_pdu, and argc number of cmd_single_line_pdu
+        */
+       mem += sizeof(*clp) + (client->argc * sizeof(*cslp));
+
+       pdu = malloc(mem);
+       clp = pdu;
+       offset = sizeof(*clp);
+
+       for (i = 0; i < client->argc; i++) {
+               uint16_t arg_len = strlen(client->argv[i]) + 1;
+
+               cslp = pdu + offset;
+               strcpy((char *) cslp->text, client->argv[i]);
+               cslp->len = cpu_to_le16(arg_len);
+               offset += sizeof(*cslp) + arg_len;
+       }
+
+       clp->lines = cpu_to_le16(client->argc);
+       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem);
        free(pdu);
        return ret;
 }
@@ -528,7 +549,7 @@ static void handle_eta(struct fio_net_cmd *cmd)
        display_thread_status(je);
 }
 
-static void handle_probe(struct fio_net_cmd *cmd)
+static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
        const char *os, *arch;
@@ -541,9 +562,12 @@ static void handle_probe(struct fio_net_cmd *cmd)
        if (!arch)
                os = "unknown";
 
-       log_info("hostname=%s, be=%u, os=%s, arch=%s, fio ver %u.%u.%u\n",
+       log_info("hostname=%s, be=%u, os=%s, arch=%s, fio=%u.%u.%u\n",
                probe->hostname, probe->bigendian, os, arch, probe->fio_major,
                probe->fio_minor, probe->fio_patch);
+
+       if (!client->name)
+               client->name = strdup((char *) probe->hostname);
 }
 
 static int handle_client(struct fio_client *client)
@@ -566,10 +590,13 @@ static int handle_client(struct fio_client *client)
                break;
        case FIO_NET_CMD_TEXT: {
                const char *buf = (const char *) cmd->payload;
+               const char *name;
                int fio_unused ret;
 
+               name = client->name ? client->name : client->hostname;
+
                if (!client->skip_newline)
-                       fprintf(f_out, "<%s> ", client->hostname);
+                       fprintf(f_out, "<%s> ", name);
                ret = fwrite(buf, cmd->pdu_len, 1, f_out);
                fflush(f_out);
                client->skip_newline = strchr(buf, '\n') == NULL;
@@ -589,7 +616,7 @@ static int handle_client(struct fio_client *client)
                free(cmd);
                break;
        case FIO_NET_CMD_PROBE:
-               handle_probe(cmd);
+               handle_probe(client, cmd);
                free(cmd);
                break;
        case FIO_NET_CMD_START: