#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);
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)
{
- struct fio_net_cmd *cmd;
- int ret;
-
- cmd = malloc(sizeof(*cmd) + size);
-
- fio_init_net_cmd(cmd, FIO_NET_CMD_JOB_END, buf, size);
- fio_net_cmd_crc(cmd);
-
- ret = fio_send_data(fio_client_fd, cmd, sizeof(*cmd) + size);
- free(cmd);
- return ret;
+ 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));
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;
+ }
if (cmd->opcode != FIO_NET_CMD_TEXT) {
printf("non text: %d\n", cmd->opcode);
free(cmd);
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;
+}