server: initial support for command line passing

[fio.git] / client.c

diff --git a/client.c b/client.c
index b82c322c2e8dbf5feed42b364104c4f83080532c..5f0f710a052cc07330bdf4aa3e6c09fea13495f2 100644 (file)
--- a/client.c
+++ b/client.c
@@ -23,10 +23,23 @@ struct fio_client {
        struct sockaddr_in addr;
        char *hostname;
        int fd;
+
+       int state;
+
+       uint16_t argc;
+       char **argv;
+};
+
+enum {
+       Client_connected        = 1,
+       Client_started          = 2,
+       Client_stopped          = 3,
 };
 
 static FLIST_HEAD(client_list);
 
+static int handle_client(struct fio_client *client, int one);
+
 static struct fio_client *find_client_by_fd(int fd)
 {
        struct fio_client *client;
@@ -42,7 +55,6 @@ static struct fio_client *find_client_by_fd(int fd)
        return NULL;
 }
 
-#if 0
 static struct fio_client *find_client_by_name(const char *name)
 {
        struct fio_client *client;
@@ -57,17 +69,44 @@ static struct fio_client *find_client_by_name(const char *name)
 
        return NULL;
 }
-#endif
 
 static void remove_client(struct fio_client *client)
 {
        dprint(FD_NET, "removed client <%s>\n", client->hostname);
        flist_del(&client->list);
        nr_clients--;
+
        free(client->hostname);
+       if (client->argv)
+               free(client->argv);
+
        free(client);
 }
 
+static void __fio_client_add_cmd_option(struct fio_client *client,
+                                       const char *opt)
+{
+       client->argc++;
+       client->argv = realloc(client->argv, sizeof(char *) * client->argc);
+       client->argv[client->argc - 1] = strdup(opt);
+}
+
+void fio_client_add_cmd_option(const char *hostname, const char *opt)
+{
+       struct fio_client *client;
+
+       if (!hostname || !opt)
+               return;
+
+       client = find_client_by_name(hostname);
+       if (!client) {
+               log_err("fio: unknown client %s\n", hostname);
+               return;
+       }
+
+       __fio_client_add_cmd_option(client, opt);
+}
+
 void fio_client_add(const char *hostname)
 {
        struct fio_client *client;
@@ -75,8 +114,12 @@ void fio_client_add(const char *hostname)
        dprint(FD_NET, "added client <%s>\n", hostname);
        client = malloc(sizeof(*client));
        memset(client, 0, sizeof(*client));
+
        client->hostname = strdup(hostname);
        client->fd = -1;
+
+       __fio_client_add_cmd_option(client, "fio");
+
        flist_add(&client->list, &client_list);
        nr_clients++;
 }
@@ -116,6 +159,7 @@ static int fio_client_connect(struct fio_client *client)
        }
 
        client->fd = fd;
+       client->state = Client_connected;
        return 0;
 }
 
@@ -151,6 +195,27 @@ static void client_signal_handler(void)
        sigaction(SIGTERM, &act, NULL);
 }
 
+static void probe_client(struct fio_client *client)
+{
+       fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
+       handle_client(client, 1);
+}
+
+static int send_client_cmd_line(struct fio_client *client)
+{
+       struct cmd_line_pdu *pdu;
+       int i, ret;
+
+       pdu = malloc(sizeof(*pdu));
+       for (i = 0; i < client->argc; i++)
+               strcpy((char *) pdu->argv[i], client->argv[i]);
+
+       pdu->argc = cpu_to_le16(client->argc);
+       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu));
+       free(pdu);
+       return ret;
+}
+
 int fio_clients_connect(void)
 {
        struct fio_client *client;
@@ -163,18 +228,20 @@ int fio_clients_connect(void)
                client = flist_entry(entry, struct fio_client, list);
 
                ret = fio_client_connect(client);
-               if (ret)
+               if (ret) {
                        remove_client(client);
+                       continue;
+               }
+
+               probe_client(client);
+
+               if (client->argc > 1)
+                       send_client_cmd_line(client);
        }
 
        return !nr_clients;
 }
 
-static int send_file_buf(struct fio_client *client, char *buf, off_t size)
-{
-       return fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, size);
-}
-
 /*
  * Send file contents to server backend. We could use sendfile(), but to remain
  * more portable lets just read/write the darn thing.
@@ -217,7 +284,12 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename)
                        continue;
        } while (1);
 
-       ret = send_file_buf(client, buf, sb.st_size);
+       if (len) {
+               log_err("fio: failed reading job file %s\n", filename);
+               return 1;
+       }
+
+       ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
        free(buf);
        return ret;
 }
@@ -370,16 +442,16 @@ static void handle_probe(struct fio_net_cmd *cmd)
 {
        struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
 
-       log_info("Probe: %s: %u.%u.%u\n", probe->hostname, probe->fio_major,
-                                       probe->fio_minor, probe->fio_patch);
+       log_info("Probe: hostname=%s, fio ver %u.%u.%u\n", probe->hostname,
+                       probe->fio_major, probe->fio_minor, probe->fio_patch);
 }
 
-static int handle_client(struct fio_client *client)
+static int handle_client(struct fio_client *client, int one)
 {
        struct fio_net_cmd *cmd;
        int done = 0;
 
-       while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
+       while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
                dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
                                                        cmd->opcode);
 
@@ -390,8 +462,9 @@ static int handle_client(struct fio_client *client)
                        done = 1;
                        break;
                case FIO_NET_CMD_TEXT:
-                       fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
-                       fflush(stdout);
+                       fprintf(f_out, "Client <%s>: ", client->hostname);
+                       fwrite(cmd->payload, cmd->pdu_len, 1, f_out);
+                       fflush(f_out);
                        free(cmd);
                        break;
                case FIO_NET_CMD_TS:
@@ -410,13 +483,21 @@ static int handle_client(struct fio_client *client)
                        handle_probe(cmd);
                        free(cmd);
                        break;
+               case FIO_NET_CMD_START:
+                       client->state = Client_started;
+                       free(cmd);
+                       break;
+               case FIO_NET_CMD_STOP:
+                       client->state = Client_stopped;
+                       free(cmd);
+                       break;
                default:
                        log_err("fio: unknown client op: %d\n", cmd->opcode);
                        free(cmd);
                        break;
                }
 
-               if (done)
+               if (done || one)
                        break;
        }
 
@@ -462,7 +543,7 @@ int fio_handle_clients(void)
                                log_err("fio: unknown client\n");
                                continue;
                        }
-                       handle_client(client);
+                       handle_client(client, 0);
                }
        }