#include <signal.h>
#include "fio.h"
+#include "client.h"
#include "server.h"
#include "flist.h"
#include "hash.h"
+extern void (*update_thread_status)(char *status_message);
+
struct client_eta {
struct jobs_eta eta;
unsigned int pending;
struct flist_head list;
struct flist_head hash_list;
struct flist_head arg_list;
- struct sockaddr_in addr;
- struct sockaddr_un addr_un;
+ union {
+ struct sockaddr_in addr;
+ struct sockaddr_in6 addr6;
+ struct sockaddr_un addr_un;
+ };
char *hostname;
int port;
int fd;
int disk_stats_shown;
unsigned int jobs;
int error;
+ int ipv6;
+ int sent_job;
struct flist_head eta_list;
struct client_eta *eta_in_flight;
char **argv;
};
+static void fio_client_text_op(struct fio_client *client,
+ FILE *f, __u16 pdu_len, const char *buf)
+{
+ const char *name;
+ int fio_unused ret;
+
+ name = client->name ? client->name : client->hostname;
+
+ if (!client->skip_newline)
+ fprintf(f, "<%s> ", name);
+ ret = fwrite(buf, pdu_len, 1, f);
+ fflush(f);
+ client->skip_newline = strchr(buf, '\n') == NULL;
+}
+
+static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd);
+static void handle_ts(struct fio_net_cmd *cmd);
+static void handle_gs(struct fio_net_cmd *cmd);
+static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd);
+static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd);
+
+struct client_ops fio_client_ops = {
+ fio_client_text_op,
+ handle_du,
+ handle_ts,
+ handle_gs,
+ handle_eta,
+ handle_probe,
+ NULL, /* status display, if NULL, printf is used */
+};
+
static struct timeval eta_tv;
enum {
#define FIO_CLIENT_HASH_MASK (FIO_CLIENT_HASH_SZ - 1)
static struct flist_head client_hash[FIO_CLIENT_HASH_SZ];
-static int handle_client(struct fio_client *client);
+static int handle_client(struct fio_client *client, struct client_ops *ops);
static void dec_jobs_eta(struct client_eta *eta);
static void fio_client_add_hash(struct fio_client *client)
if (fio_server_parse_string(hostname, &client->hostname,
&client->is_sock, &client->port,
- &client->addr.sin_addr))
+ &client->addr.sin_addr,
+ &client->addr6.sin6_addr,
+ &client->ipv6))
return -1;
client->fd = -1;
static int fio_client_connect_ip(struct fio_client *client)
{
- int fd;
-
- client->addr.sin_family = AF_INET;
- client->addr.sin_port = htons(client->port);
+ struct sockaddr *addr;
+ fio_socklen_t socklen;
+ int fd, domain;
+
+ if (client->ipv6) {
+ client->addr6.sin6_family = AF_INET6;
+ client->addr6.sin6_port = htons(client->port);
+ domain = AF_INET6;
+ addr = (struct sockaddr *) &client->addr6;
+ socklen = sizeof(client->addr6);
+ } else {
+ client->addr.sin_family = AF_INET;
+ client->addr.sin_port = htons(client->port);
+ domain = AF_INET;
+ addr = (struct sockaddr *) &client->addr;
+ socklen = sizeof(client->addr);
+ }
- fd = socket(AF_INET, SOCK_STREAM, 0);
+ fd = socket(domain, SOCK_STREAM, 0);
if (fd < 0) {
log_err("fio: socket: %s\n", strerror(errno));
return -1;
}
- if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
+ if (connect(fd, addr, socklen) < 0) {
log_err("fio: connect: %s\n", strerror(errno));
log_err("fio: failed to connect to %s:%u\n", client->hostname,
client->port);
struct flist_head *entry, *tmp;
int ret;
+#ifdef WIN32
+ WSADATA wsd;
+ WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
dprint(FD_NET, "client: connect all\n");
client_signal_handler();
return 1;
}
+ client->sent_job = 1;
ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size, 0);
free(buf);
close(fd);
if (fio_client_send_ini(client, filename))
remove_client(client);
+
+ client->sent_job = 1;
}
return !nr_clients;
agg->io_ticks = le32_to_cpu(agg->io_ticks);
agg->time_in_queue = le32_to_cpu(agg->time_in_queue);
agg->slavecount = le32_to_cpu(agg->slavecount);
- agg->max_util.u.f = __le64_to_cpu(fio_uint64_to_double(agg->max_util.u.i));
+ agg->max_util.u.f = fio_uint64_to_double(__le64_to_cpu(agg->max_util.u.i));
}
static void convert_dus(struct disk_util_stat *dus)
log_info("client <%s>: exited with error %d\n", client->hostname, client->error);
}
-static int handle_client(struct fio_client *client)
+static int handle_client(struct fio_client *client, struct client_ops *ops)
{
struct fio_net_cmd *cmd;
break;
case FIO_NET_CMD_TEXT: {
const char *buf = (const char *) cmd->payload;
- const char *name;
- int fio_unused ret;
-
- name = client->name ? client->name : client->hostname;
-
- if (!client->skip_newline)
- fprintf(f_out, "<%s> ", name);
- ret = fwrite(buf, cmd->pdu_len, 1, f_out);
- fflush(f_out);
- client->skip_newline = strchr(buf, '\n') == NULL;
+ ops->text_op(client, f_out, cmd->pdu_len, buf);
free(cmd);
break;
}
case FIO_NET_CMD_DU:
- handle_du(client, cmd);
+ ops->disk_util(client, cmd);
free(cmd);
break;
case FIO_NET_CMD_TS:
- handle_ts(cmd);
+ ops->thread_status(cmd);
free(cmd);
break;
case FIO_NET_CMD_GS:
- handle_gs(cmd);
+ ops->group_stats(cmd);
free(cmd);
break;
case FIO_NET_CMD_ETA:
remove_reply_cmd(client, cmd);
- handle_eta(client, cmd);
+ ops->eta(client, cmd);
free(cmd);
break;
case FIO_NET_CMD_PROBE:
remove_reply_cmd(client, cmd);
- handle_probe(client, cmd);
+ ops->probe(client, cmd);
free(cmd);
break;
case FIO_NET_CMD_RUN:
return ret;
}
-int fio_handle_clients(void)
+int fio_handle_clients(struct client_ops *ops)
{
- struct fio_client *client;
- struct flist_head *entry;
struct pollfd *pfds;
int i, ret = 0, retval = 0;
init_thread_stat(&client_ts);
init_group_run_stat(&client_gs);
+ /* Used by eta.c:display_thread_status() */
+ update_thread_status = ops->thread_status_display;
+
while (!exit_backend && nr_clients) {
+ struct flist_head *entry, *tmp;
+ struct fio_client *client;
+
i = 0;
- flist_for_each(entry, &client_list) {
+ flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
+ if (!client->sent_job &&
+ flist_empty(&client->cmd_list)) {
+ remove_client(client);
+ continue;
+ }
+
pfds[i].fd = client->fd;
pfds[i].events = POLLIN;
i++;
}
+ if (!nr_clients)
+ break;
+
assert(i == nr_clients);
do {
log_err("fio: unknown client fd %d\n", pfds[i].fd);
continue;
}
- if (!handle_client(client)) {
+ if (!handle_client(client, ops)) {
log_info("client: host=%s disconnected\n",
client->hostname);
remove_client(client);
retval = 1;
- }
- if (client->error)
+ } else if (client->error)
retval = 1;
}
}
projects / fio.git / blobdiff