client: improve handling of multiple clients

[fio.git] / client.c

diff --git a/client.c b/client.c
index d538e8ab95cdecb6dabde63dbf7469c1416fef80..5a6fc39ff8dac6f984e5bdfa2603a210ec9973b4 100644 (file)
--- a/client.c
+++ b/client.c
@@ -42,7 +42,7 @@ enum {
 
 static FLIST_HEAD(client_list);
 
-static int handle_client(struct fio_client *client, int one);
+static int handle_client(struct fio_client *client, int one, int block);
 
 static struct fio_client *find_client_by_fd(int fd)
 {
@@ -87,31 +87,38 @@ static void remove_client(struct fio_client *client)
        free(client);
 }
 
-static void __fio_client_add_cmd_option(struct fio_client *client,
-                                       const char *opt)
+static int __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;
 }
 
-void fio_client_add_cmd_option(const char *hostname, const char *opt)
+int fio_client_add_cmd_option(const char *hostname, const char *opt)
 {
        struct fio_client *client;
 
        if (!hostname || !opt)
-               return;
+               return 0;
 
        client = find_client_by_name(hostname);
        if (!client) {
                log_err("fio: unknown client %s\n", hostname);
-               return;
+               return 1;
        }
 
-       __fio_client_add_cmd_option(client, opt);
+       return __fio_client_add_cmd_option(client, opt);
 }
 
 void fio_client_add(const char *hostname)
@@ -210,7 +217,7 @@ static void probe_client(struct fio_client *client)
        dprint(FD_NET, "client: send probe\n");
 
        fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
-       handle_client(client, 1);
+       handle_client(client, 1, 1);
 }
 
 static int send_client_cmd_line(struct fio_client *client)
@@ -472,16 +479,18 @@ static void handle_probe(struct fio_net_cmd *cmd)
                probe->fio_minor, probe->fio_patch);
 }
 
-static int handle_client(struct fio_client *client, int one)
+static int handle_client(struct fio_client *client, int one, int block)
 {
        struct fio_net_cmd *cmd;
-       int done = 0;
+       int done = 0, did_cmd = 0;
 
        dprint(FD_NET, "client: handle %s\n", client->hostname);
 
-       while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
-               dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
-                                                       cmd->opcode);
+       while ((cmd = fio_net_recv_cmd(client->fd, block)) != NULL) {
+               did_cmd++;
+
+               dprint(FD_NET, "client: got cmd op %d from %s\n",
+                                       cmd->opcode, client->hostname);
 
                switch (cmd->opcode) {
                case FIO_NET_CMD_QUIT:
@@ -491,10 +500,11 @@ static int handle_client(struct fio_client *client, int one)
                        break;
                case FIO_NET_CMD_TEXT: {
                        const char *buf = (const char *) cmd->payload;
+                       int fio_unused ret;
 
                        if (!client->skip_newline)
-                               fprintf(f_out, "Client <%s>: ", client->hostname);
-                       fwrite(buf, cmd->pdu_len, 1, f_out);
+                               fprintf(f_out, "<%s> ", client->hostname);
+                       ret = fwrite(buf, cmd->pdu_len, 1, f_out);
                        fflush(f_out);
                        client->skip_newline = strchr(buf, '\n') == NULL;
                        free(cmd);
@@ -534,7 +544,7 @@ static int handle_client(struct fio_client *client, int one)
                        break;
        }
 
-       return 0;
+       return did_cmd;
 }
 
 int fio_handle_clients(void)
@@ -578,7 +588,11 @@ int fio_handle_clients(void)
                                log_err("fio: unknown client\n");
                                continue;
                        }
-                       handle_client(client, 0);
+                       if (!handle_client(client, 0, 0)) {
+                               log_info("client: host=%s disconnected\n",
+                                               client->hostname);
+                               remove_client(client);
+                       }
                }
        }