X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=client.c;h=63ecee6d11c93c315a35d1153c6933e326d63ad9;hb=46c48f1f9b8ce94132c13638e4c83c13e1d392da;hp=1074da446be7839a9f40f2d21419504286f69140;hpb=794d69ca97738736844ee6a6da37f1ef686578cb;p=fio.git diff --git a/client.c b/client.c index 1074da44..63ecee6d 100644 --- a/client.c +++ b/client.c @@ -16,61 +16,145 @@ #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; +}; -int fio_client_connect(const char *host) +static FLIST_HEAD(client_list); + +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; +} + +#if 0 +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; +} +#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); + free(client); +} + +void fio_client_add(const char *hostname) +{ + struct fio_client *client; + + dprint(FD_NET, "added client <%s>\n", hostname); + client = malloc(sizeof(*client)); + memset(client, 0, sizeof(*client)); + client->hostname = strdup(hostname); + client->fd = -1; + flist_add(&client->list, &client_list); + nr_clients++; +} + +static int fio_client_connect(struct fio_client *client) { - struct sockaddr_in addr; int fd; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = htons(fio_net_port); + dprint(FD_NET, "connect to host %s\n", client->hostname); + + 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, &addr.sin_addr) != 1) { + if (inet_aton(client->hostname, &client->addr.sin_addr) != 1) { struct hostent *hent; - hent = gethostbyname(host); + hent = gethostbyname(client->hostname); if (!hent) { log_err("fio: gethostbyname: %s\n", strerror(errno)); 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->fd = fd; return 0; } -static int send_file_buf(char *buf, off_t size) +int fio_clients_connect(void) { - return fio_net_send_cmd(fio_client_fd, FIO_NET_CMD_JOB, buf, size); + struct fio_client *client; + struct flist_head *entry, *tmp; + int ret; + + flist_for_each_safe(entry, tmp, &client_list) { + client = flist_entry(entry, struct fio_client, list); + + ret = fio_client_connect(client); + if (ret) + remove_client(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. */ -int fio_client_send_ini(const char *filename) +static int fio_client_send_ini(struct fio_client *client, const char *filename) { struct stat sb; char *p, *buf; off_t len; int fd, ret; + dprint(FD_NET, "send ini %s to %s\n", filename, client->hostname); + fd = open(filename, O_RDONLY); if (fd < 0) { log_err("fio: job file open: %s\n", strerror(errno)); @@ -100,25 +184,40 @@ 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) +int fio_clients_send_ini(const char *filename) +{ + struct fio_client *client; + struct flist_head *entry, *tmp; + + flist_for_each_safe(entry, tmp, &client_list) { + client = flist_entry(entry, struct fio_client, list); + + if (fio_client_send_ini(client, filename)) + remove_client(client); + } + + return !nr_clients; +} + +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) { + dprint(FD_NET, "%s: got cmd op %d\n", client->hostname, + cmd->opcode); 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 +233,51 @@ 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, ret = 0; + + pfds = malloc(nr_clients * sizeof(struct pollfd)); + + while (!exit_backend && nr_clients) { + i = 0; + flist_for_each(entry, &client_list) { + client = flist_entry(entry, struct fio_client, list); + + pfds[i].fd = client->fd; + pfds[i].events = POLLIN; + i++; + } + + assert(i == 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; +}