#include "fio.h"
#include "server.h"
-#include "crc/crc32.h"
#include "flist.h"
+#include "hash.h"
struct fio_client {
struct flist_head list;
+ struct flist_head fd_hash_list;
+ struct flist_head name_hash_list;
struct sockaddr_in addr;
char *hostname;
int fd;
static FLIST_HEAD(client_list);
-static int handle_client(struct fio_client *client, int one);
+#define FIO_CLIENT_HASH_BITS 7
+#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
+#define FIO_CLIENT_HASH_MASK (FIO_CLIENT_HASH_SZ - 1)
+static struct flist_head client_fd_hash[FIO_CLIENT_HASH_SZ];
+static struct flist_head client_name_hash[FIO_CLIENT_HASH_SZ];
+
+static int handle_client(struct fio_client *client);
+
+static void fio_client_add_fd_hash(struct fio_client *client)
+{
+ int bucket = hash_long(client->fd, FIO_CLIENT_HASH_BITS);
+
+ bucket &= FIO_CLIENT_HASH_MASK;
+ flist_add(&client->fd_hash_list, &client_fd_hash[bucket]);
+}
+
+static void fio_client_remove_fd_hash(struct fio_client *client)
+{
+ if (!flist_empty(&client->fd_hash_list))
+ flist_del_init(&client->fd_hash_list);
+}
+
+static void fio_client_add_name_hash(struct fio_client *client)
+{
+ int bucket = jhash(client->hostname, strlen(client->hostname), 0);
+
+ bucket &= FIO_CLIENT_HASH_MASK;
+ flist_add(&client->name_hash_list, &client_name_hash[bucket]);
+}
+
+static void fio_client_remove_name_hash(struct fio_client *client)
+{
+ if (!flist_empty(&client->name_hash_list))
+ flist_del_init(&client->name_hash_list);
+}
+
+static void fio_init fio_client_hash_init(void)
+{
+ int i;
+
+ for (i = 0; i < FIO_CLIENT_HASH_SZ; i++) {
+ INIT_FLIST_HEAD(&client_fd_hash[i]);
+ INIT_FLIST_HEAD(&client_name_hash[i]);
+ }
+}
static struct fio_client *find_client_by_fd(int fd)
{
+ int bucket = hash_long(fd, FIO_CLIENT_HASH_BITS) & FIO_CLIENT_HASH_MASK;
struct fio_client *client;
struct flist_head *entry;
- flist_for_each(entry, &client_list) {
- client = flist_entry(entry, struct fio_client, list);
+ flist_for_each(entry, &client_fd_hash[bucket]) {
+ client = flist_entry(entry, struct fio_client, fd_hash_list);
if (client->fd == fd)
return client;
static struct fio_client *find_client_by_name(const char *name)
{
+ int bucket = jhash(name, strlen(name), 0) & FIO_CLIENT_HASH_BITS;
struct fio_client *client;
struct flist_head *entry;
- flist_for_each(entry, &client_list) {
- client = flist_entry(entry, struct fio_client, list);
+ flist_for_each(entry, &client_name_hash[bucket]) {
+ client = flist_entry(entry, struct fio_client, name_hash_list);
if (!strcmp(name, client->hostname))
return client;
{
dprint(FD_NET, "client: removed <%s>\n", client->hostname);
flist_del(&client->list);
- nr_clients--;
+
+ fio_client_remove_fd_hash(client);
+ fio_client_remove_name_hash(client);
free(client->hostname);
if (client->argv)
free(client->argv);
free(client);
+ nr_clients--;
}
static int __fio_client_add_cmd_option(struct fio_client *client,
client = malloc(sizeof(*client));
memset(client, 0, sizeof(*client));
+ INIT_FLIST_HEAD(&client->list);
+ INIT_FLIST_HEAD(&client->fd_hash_list);
+ INIT_FLIST_HEAD(&client->name_hash_list);
+
client->hostname = strdup(hostname);
client->fd = -1;
+ fio_client_add_name_hash(client);
+
__fio_client_add_cmd_option(client, "fio");
flist_add(&client->list, &client_list);
hent = gethostbyname(client->hostname);
if (!hent) {
log_err("fio: gethostbyname: %s\n", strerror(errno));
+ log_err("fio: failed looking up hostname %s\n",
+ client->hostname);
return 1;
}
}
client->fd = fd;
+ fio_client_add_fd_hash(client);
client->state = Client_connected;
return 0;
}
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);
}
static int send_client_cmd_line(struct fio_client *client)
fd = open(filename, O_RDONLY);
if (fd < 0) {
- log_err("fio: job file open: %s\n", strerror(errno));
+ log_err("fio: job file <%s> open: %s\n", filename, strerror(errno));
return 1;
}
probe->fio_minor, probe->fio_patch);
}
-static int handle_client(struct fio_client *client, int one)
+static int handle_client(struct fio_client *client)
{
struct fio_net_cmd *cmd;
- 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) {
- did_cmd++;
+ cmd = fio_net_recv_cmd(client->fd);
+ if (!cmd)
+ return 0;
- dprint(FD_NET, "client: got cmd op %d from %s\n",
+ dprint(FD_NET, "client: got cmd op %d from %s\n",
cmd->opcode, client->hostname);
- switch (cmd->opcode) {
- case FIO_NET_CMD_QUIT:
- remove_client(client);
- free(cmd);
- done = 1;
- break;
- case FIO_NET_CMD_TEXT: {
- const char *buf = (const char *) cmd->payload;
- int fio_unused ret;
-
- if (!client->skip_newline)
- 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);
- break;
- }
- case FIO_NET_CMD_TS:
- handle_ts(cmd);
- free(cmd);
- break;
- case FIO_NET_CMD_GS:
- handle_gs(cmd);
- free(cmd);
- break;
- case FIO_NET_CMD_ETA:
- handle_eta(cmd);
- free(cmd);
- break;
- case FIO_NET_CMD_PROBE:
- 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;
+ switch (cmd->opcode) {
+ case FIO_NET_CMD_QUIT:
+ remove_client(client);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_TEXT: {
+ const char *buf = (const char *) cmd->payload;
+ int fio_unused ret;
+
+ if (!client->skip_newline)
+ 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);
+ break;
}
-
- if (done || one)
- break;
+ case FIO_NET_CMD_TS:
+ handle_ts(cmd);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_GS:
+ handle_gs(cmd);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_ETA:
+ handle_eta(cmd);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_PROBE:
+ 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;
}
- return did_cmd;
+ return 1;
}
int fio_handle_clients(void)
client = find_client_by_fd(pfds[i].fd);
if (!client) {
- log_err("fio: unknown client\n");
+ log_err("fio: unknown client fd %d\n", pfds[i].fd);
continue;
}
- handle_client(client, 0);
+ if (!handle_client(client)) {
+ log_info("client: host=%s disconnected\n",
+ client->hostname);
+ remove_client(client);
+ }
}
}
projects / fio.git / blobdiff