client: initial support for multiple connections

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Makefile b/Makefile
index ea3306b32dc5f80b9d267877d725c90d4d5387f4..23bbb598041d1fdd59a6057365ba42c3f0555f7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CC      = gcc
 DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
 CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
        $(DEBUGFLAGS)
-OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS)
+OPTFLAGS= -fno-omit-frame-pointer -g $(EXTFLAGS)
 CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
 LIBS   = -lm $(EXTLIBS)
 PROGS  = fio

diff --git a/client.c b/client.c
index 1074da446be7839a9f40f2d21419504286f69140..368ad9e7bed81a9ac550fc1eb7f5efef182c65c3 100644 (file)
--- a/client.c
+++ b/client.c
@@ -16,19 +16,69 @@
 #include "fio.h"
 #include "server.h"
 #include "crc/crc32.h"
+#include "flist.h"
 
-int fio_client_fd = -1;
+struct fio_client {
+       struct flist_head list;
+       struct sockaddr_in addr;
+       char *hostname;
+       int fd;
+};
+
+static FLIST_HEAD(client_list);
+static unsigned int nr_clients;
+
+static struct fio_client *find_client_by_fd(int fd)
+{
+       struct fio_client *client;
+       struct flist_head *entry;
+
+       flist_for_each(entry, &client_list) {
+               client = flist_entry(entry, struct fio_client, list);
+
+               if (client->fd == fd)
+                       return client;
+       }
+
+       return NULL;
+}
+
+static struct fio_client *find_client_by_name(const char *name)
+{
+       struct fio_client *client;
+       struct flist_head *entry;
+
+       flist_for_each(entry, &client_list) {
+               client = flist_entry(entry, struct fio_client, list);
+
+               if (!strcmp(name, client->hostname))
+                       return client;
+       }
+
+       return NULL;
+}
+
+static void remove_client(struct fio_client *client)
+{
+       printf("remove client %s\n", client->hostname);
+       flist_del(&client->list);
+       nr_clients--;
+       free(client->hostname);
+       free(client);
+}
 
 int fio_client_connect(const char *host)
 {
-       struct sockaddr_in addr;
+       struct fio_client *client;
        int fd;
 
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(fio_net_port);
+       client = malloc(sizeof(*client));
 
-       if (inet_aton(host, &addr.sin_addr) != 1) {
+       memset(&client->addr, 0, sizeof(client->addr));
+       client->addr.sin_family = AF_INET;
+       client->addr.sin_port = htons(fio_net_port);
+
+       if (inet_aton(host, &client->addr.sin_addr) != 1) {
                struct hostent *hent;
 
                hent = gethostbyname(host);
@@ -37,40 +87,52 @@ int fio_client_connect(const char *host)
                        return 1;
                }
 
-               memcpy(&addr.sin_addr, hent->h_addr, 4);
+               memcpy(&client->addr.sin_addr, hent->h_addr, 4);
        }
 
        fd = socket(AF_INET, SOCK_STREAM, 0);
        if (fd < 0) {
                log_err("fio: socket: %s\n", strerror(errno));
+               free(client);
                return 1;
        }
 
-       if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+       if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
                log_err("fio: connect: %s\n", strerror(errno));
+               free(client);
                return 1;
        }
 
-       fio_client_fd = fd;
+       client->hostname = strdup(host);
+       flist_add(&client->list, &client_list);
+       nr_clients++;
+       client->fd = fd;
        return 0;
 }
 
-static int send_file_buf(char *buf, off_t size)
+static int send_file_buf(struct fio_client *client, char *buf, off_t size)
 {
-       return fio_net_send_cmd(fio_client_fd, FIO_NET_CMD_JOB, buf, 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.
  */
-int fio_client_send_ini(const char *filename)
+int fio_client_send_ini(const char *hostname, const char *filename)
 {
+       struct fio_client *client;
        struct stat sb;
        char *p, *buf;
        off_t len;
        int fd, ret;
 
+       client = find_client_by_name(hostname);
+       if (!client) {
+               log_err("fio: can't find client for host %s\n", hostname);
+               return 1;
+       }
+
        fd = open(filename, O_RDONLY);
        if (fd < 0) {
                log_err("fio: job file open: %s\n", strerror(errno));
@@ -100,25 +162,22 @@ int fio_client_send_ini(const char *filename)
                        continue;
        } while (1);
 
-       ret = send_file_buf(buf, sb.st_size);
+       ret = send_file_buf(client, buf, sb.st_size);
        free(buf);
        return ret;
 }
 
-int fio_handle_clients(void)
+static int handle_client(struct fio_client *client)
 {
        struct fio_net_cmd *cmd;
 
-       while (!exit_backend) {
-               cmd = fio_net_cmd_read(fio_client_fd);
-               if (!cmd)
-                       continue;
-
+       while ((cmd = fio_net_cmd_read(client->fd)) != NULL) {
                if (cmd->opcode == FIO_NET_CMD_ACK) {
                        free(cmd);
                        continue;
                }
                if (cmd->opcode == FIO_NET_CMD_QUIT) {
+                       remove_client(client);
                        free(cmd);
                        break;
                }
@@ -134,3 +193,48 @@ int fio_handle_clients(void)
 
        return 0;
 }
+
+int fio_handle_clients(void)
+{
+       struct fio_client *client;
+       struct flist_head *entry;
+       struct pollfd *pfds;
+       int i = 0, ret = 0;
+
+       pfds = malloc(nr_clients * sizeof(struct pollfd));
+
+       flist_for_each(entry, &client_list) {
+               client = flist_entry(entry, struct fio_client, list);
+
+               pfds[i].fd = client->fd;
+               pfds[i].events = POLLIN;
+               i++;
+       }
+
+       while (!exit_backend && nr_clients) {
+               ret = poll(pfds, nr_clients, 100);
+               if (ret < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       log_err("fio: poll clients: %s\n", strerror(errno));
+                       break;
+               } else if (!ret)
+                       continue;
+
+               for (i = 0; i < nr_clients; i++) {
+                       if (!(pfds[i].revents & POLLIN))
+                               continue;
+
+                       client = find_client_by_fd(pfds[i].fd);
+                       if (!client) {
+                               log_err("fio: unknown client\n");
+                               continue;
+                       }
+                       handle_client(client);
+               }
+       }
+
+       free(pfds);
+
+       return 0;
+}

diff --git a/init.c b/init.c
index 87052b9e5476aae581ffc6475293aa5529bf7590..19f94e59ce6af5d51fb31b164bb3c97b7db6e8a7 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1385,7 +1385,7 @@ int parse_options(int argc, char *argv[])
                if (fill_def_thread())
                        return 1;
                if (is_client) {
-                       if (fio_client_send_ini(ini_file[i]))
+                       if (fio_client_send_ini(client, ini_file[i]))
                                return 1;
                } else {
                        if (parse_jobs_ini(ini_file[i], 0, i))

diff --git a/server.h b/server.h
index c85f1bcc36e090431423e9f39f7a143477b5510a..0f57ae85cf0994338c4958a1f8a94fecfc74c5f0 100644 (file)
--- a/server.h
+++ b/server.h
@@ -44,7 +44,7 @@ extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const char *, off_t);
 
 extern int fio_client_connect(const char *);
-extern int fio_client_send_ini(const char *);
+extern int fio_client_send_ini(const char *, const char *);
 extern int fio_handle_clients(void);
 
 extern int fio_recv_data(int sk, void *p, unsigned int len);