#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/socket.h>
+#include <sys/un.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#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 hash_list;
struct sockaddr_in addr;
+ struct sockaddr_un addr_un;
char *hostname;
+ int port;
int fd;
int state;
int skip_newline;
+ int is_sock;
uint16_t argc;
char **argv;
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_hash[FIO_CLIENT_HASH_SZ];
-static struct fio_client *find_client_by_fd(int fd)
+static int handle_client(struct fio_client *client);
+
+static void fio_client_add_hash(struct fio_client *client)
{
- struct fio_client *client;
- struct flist_head *entry;
+ int bucket = hash_long(client->fd, FIO_CLIENT_HASH_BITS);
- flist_for_each(entry, &client_list) {
- client = flist_entry(entry, struct fio_client, list);
+ bucket &= FIO_CLIENT_HASH_MASK;
+ flist_add(&client->hash_list, &client_hash[bucket]);
+}
- if (client->fd == fd)
- return client;
- }
+static void fio_client_remove_hash(struct fio_client *client)
+{
+ if (!flist_empty(&client->hash_list))
+ flist_del_init(&client->hash_list);
+}
- return NULL;
+static void fio_init fio_client_hash_init(void)
+{
+ int i;
+
+ for (i = 0; i < FIO_CLIENT_HASH_SZ; i++)
+ INIT_FLIST_HEAD(&client_hash[i]);
}
-static struct fio_client *find_client_by_name(const char *name)
+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_hash[bucket]) {
+ client = flist_entry(entry, struct fio_client, hash_list);
- if (!strcmp(name, client->hostname))
+ if (client->fd == fd)
return client;
}
{
dprint(FD_NET, "client: removed <%s>\n", client->hostname);
flist_del(&client->list);
- nr_clients--;
+
+ fio_client_remove_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,
return 0;
}
-int fio_client_add_cmd_option(const char *hostname, const char *opt)
+int fio_client_add_cmd_option(void *cookie, const char *opt)
{
- struct fio_client *client;
+ struct fio_client *client = cookie;
- if (!hostname || !opt)
+ if (!client || !opt)
return 0;
- client = find_client_by_name(hostname);
- if (!client) {
- log_err("fio: unknown client %s\n", hostname);
- return 1;
- }
-
return __fio_client_add_cmd_option(client, opt);
}
-void fio_client_add(const char *hostname)
+int fio_client_add(const char *hostname, void **cookie)
{
struct fio_client *client;
- dprint(FD_NET, "client: added <%s>\n", hostname);
client = malloc(sizeof(*client));
memset(client, 0, sizeof(*client));
- client->hostname = strdup(hostname);
+ INIT_FLIST_HEAD(&client->list);
+ INIT_FLIST_HEAD(&client->hash_list);
+
+ if (fio_server_parse_string(hostname, &client->hostname,
+ &client->is_sock, &client->port,
+ &client->addr.sin_addr))
+ return -1;
+
client->fd = -1;
__fio_client_add_cmd_option(client, "fio");
flist_add(&client->list, &client_list);
nr_clients++;
+ dprint(FD_NET, "client: added <%s>\n", client->hostname);
+ *cookie = client;
+ return 0;
}
-static int fio_client_connect(struct fio_client *client)
+static int fio_client_connect_ip(struct fio_client *client)
{
int fd;
- dprint(FD_NET, "client: 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(client->hostname, &client->addr.sin_addr) != 1) {
- struct hostent *hent;
-
- hent = gethostbyname(client->hostname);
- if (!hent) {
- log_err("fio: gethostbyname: %s\n", strerror(errno));
- return 1;
- }
-
- memcpy(&client->addr.sin_addr, hent->h_addr, 4);
- }
+ client->addr.sin_port = htons(client->port);
fd = socket(AF_INET, SOCK_STREAM, 0);
if (fd < 0) {
log_err("fio: socket: %s\n", strerror(errno));
- return 1;
+ return -1;
}
if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
log_err("fio: connect: %s\n", strerror(errno));
- log_err("fio: failed to connect to %s\n", client->hostname);
- return 1;
+ log_err("fio: failed to connect to %s:%u\n", client->hostname,
+ client->port);
+ close(fd);
+ return -1;
}
+ return fd;
+}
+
+static int fio_client_connect_sock(struct fio_client *client)
+{
+ struct sockaddr_un *addr = &client->addr_un;
+ fio_socklen_t len;
+ int fd;
+
+ memset(addr, 0, sizeof(*addr));
+ addr->sun_family = AF_UNIX;
+ strcpy(addr->sun_path, client->hostname);
+
+ fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ log_err("fio: socket: %s\n", strerror(errno));
+ return -1;
+ }
+
+ len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1;
+ if (connect(fd, (struct sockaddr *) addr, len) < 0) {
+ log_err("fio: connect; %s\n", strerror(errno));
+ close(fd);
+ return -1;
+ }
+
+ return fd;
+}
+
+static int fio_client_connect(struct fio_client *client)
+{
+ int fd;
+
+ dprint(FD_NET, "client: connect to host %s\n", client->hostname);
+
+ if (client->is_sock)
+ fd = fio_client_connect_sock(client);
+ else
+ fd = fio_client_connect_ip(client);
+
+ if (fd < 0)
+ return 1;
+
client->fd = fd;
+ fio_client_add_hash(client);
client->state = Client_connected;
return 0;
}
static void sig_int(int sig)
{
- dprint(FD_NET, "client: got sign %d\n", sig);
+ dprint(FD_NET, "client: got signal %d\n", sig);
fio_clients_terminate();
}
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;
}
if (fstat(fd, &sb) < 0) {
log_err("fio: job file stat: %s\n", strerror(errno));
+ close(fd);
return 1;
}
if (len) {
log_err("fio: failed reading job file %s\n", filename);
+ close(fd);
+ free(buf);
return 1;
}
ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
free(buf);
+ close(fd);
return ret;
}
static void handle_probe(struct fio_net_cmd *cmd)
{
struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
+ const char *os, *arch;
+
+ os = fio_get_os_string(probe->os);
+ if (!os)
+ os = "unknown";
- log_info("Probe: hostname=%s, be=%u, fio ver %u.%u.%u\n",
- probe->hostname, probe->bigendian, probe->fio_major,
+ arch = fio_get_arch_string(probe->arch);
+ if (!arch)
+ os = "unknown";
+
+ log_info("hostname=%s, be=%u, os=%s, arch=%s, fio ver %u.%u.%u\n",
+ probe->hostname, probe->bigendian, os, arch, probe->fio_major,
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;
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);
+ cmd = fio_net_recv_cmd(client->fd);
+ if (!cmd)
+ return 0;
- 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;
+ 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);
+ 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 0;
+ 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