Add protocol support for an arbitrary number of command line arguments

[fio.git] / server.c

diff --git a/server.c b/server.c
index 61bbe44edd245d91d5bd476a8d44d451031b5b04..a54db7bf5d385aee5dbbc9e66d159169681f4de3 100644 (file)
--- a/server.c
+++ b/server.c
@@ -22,6 +22,8 @@
 #include "crc/crc16.h"
 #include "ieee754.h"
 
+#include "fio_version.h"
+
 int fio_net_port = 8765;
 
 int exit_backend = 0;
@@ -100,7 +102,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd)
        cmd->pdu_len    = le32_to_cpu(cmd->pdu_len);
 
        switch (cmd->version) {
-       case FIO_SERVER_VER2:
+       case FIO_SERVER_VER:
                break;
        default:
                log_err("fio: bad server cmd version %d\n", cmd->version);
@@ -268,24 +270,36 @@ static int handle_job_cmd(struct fio_net_cmd *cmd)
 
 static int handle_jobline_cmd(struct fio_net_cmd *cmd)
 {
-       struct cmd_line_pdu *pdu = (struct cmd_line_pdu *) cmd->payload;
-       char *argv[FIO_NET_CMD_JOBLINE_ARGV];
+       void *pdu = cmd->payload;
+       struct cmd_single_line_pdu *cslp;
+       struct cmd_line_pdu *clp;
+       unsigned long offset;
+       char **argv;
        int ret, i;
 
-       pdu->argc = le16_to_cpu(pdu->argc);
+       clp = pdu;
+       clp->lines = le16_to_cpu(clp->lines);
+       argv = malloc(clp->lines * sizeof(char *));
+       offset = sizeof(*clp);
+
+       dprint(FD_NET, "server: %d command line args\n", clp->lines);
 
-       dprint(FD_NET, "server: %d command line args\n", pdu->argc);
+       for (i = 0; i < clp->lines; i++) {
+               cslp = pdu + offset;
+               argv[i] = (char *) cslp->text;
 
-       for (i = 0; i < pdu->argc; i++) {
-               argv[i] = (char *) pdu->argv[i];
+               offset += sizeof(*cslp) + le16_to_cpu(cslp->len);
                dprint(FD_NET, "server: %d: %s\n", i, argv[i]);
        }
 
-       if (parse_cmd_line(pdu->argc, argv)) {
+       if (parse_cmd_line(clp->lines, argv)) {
                fio_server_send_quit_cmd();
+               free(argv);
                return -1;
        }
 
+       free(argv);
+
        fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0);
 
        ret = exec_run();
@@ -307,6 +321,9 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd)
        probe.fio_minor = FIO_MINOR;
        probe.fio_patch = FIO_PATCH;
 
+       probe.os        = FIO_OS;
+       probe.arch      = FIO_ARCH;
+
        return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe));
 }
 
@@ -743,7 +760,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
 {
        *ptr = NULL;
        *is_sock = 0;
-       *port = 0;
+       *port = fio_net_port;
 
        if (!strncmp(str, "sock:", 5)) {
                *ptr = strdup(str + 5);
@@ -797,7 +814,6 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
 
                        hent = gethostbyname(host);
                        if (!hent) {
-                               printf("FAIL\n");
                                free(*ptr);
                                *ptr = NULL;
                                return 1;
@@ -827,22 +843,25 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
  */
 static int fio_handle_server_arg(void)
 {
-       int is_sock, ret;
+       int port = fio_net_port;
+       int is_sock, ret = 0;
 
        saddr_in.sin_addr.s_addr = htonl(INADDR_ANY);
-       saddr_in.sin_port = htons(fio_net_port);
 
        if (!fio_server_arg)
-               return 0;
+               goto out;
 
        ret = fio_server_parse_string(fio_server_arg, &bind_sock, &is_sock,
-                                       &fio_net_port, &saddr_in.sin_addr);
+                                       &port, &saddr_in.sin_addr);
 
        if (!is_sock && bind_sock) {
                free(bind_sock);
                bind_sock = NULL;
        }
 
+out:
+       fio_net_port = port;
+       saddr_in.sin_port = htons(port);
        return ret;
 }