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 skip_newline;
int is_sock;
+ int disk_stats_shown;
+ unsigned int jobs;
+ int error;
+ int ipv6;
struct flist_head eta_list;
struct client_eta *eta_in_flight;
Client_created = 0,
Client_connected = 1,
Client_started = 2,
- Client_stopped = 3,
- Client_exited = 4,
+ Client_running = 3,
+ Client_stopped = 4,
+ Client_exited = 5,
};
static FLIST_HEAD(client_list);
free(client);
nr_clients--;
+ sum_stat_clients--;
}
static void __fio_client_add_cmd_option(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);
show_group_stats(gs);
}
+static void convert_agg(struct disk_util_agg *agg)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ agg->ios[i] = le32_to_cpu(agg->ios[i]);
+ agg->merges[i] = le32_to_cpu(agg->merges[i]);
+ agg->sectors[i] = le64_to_cpu(agg->sectors[i]);
+ agg->ticks[i] = le32_to_cpu(agg->ticks[i]);
+ }
+
+ 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 = fio_uint64_to_double(__le64_to_cpu(agg->max_util.u.i));
+}
+
+static void convert_dus(struct disk_util_stat *dus)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ dus->ios[i] = le32_to_cpu(dus->ios[i]);
+ dus->merges[i] = le32_to_cpu(dus->merges[i]);
+ dus->sectors[i] = le64_to_cpu(dus->sectors[i]);
+ dus->ticks[i] = le32_to_cpu(dus->ticks[i]);
+ }
+
+ dus->io_ticks = le32_to_cpu(dus->io_ticks);
+ dus->time_in_queue = le32_to_cpu(dus->time_in_queue);
+ dus->msec = le64_to_cpu(dus->msec);
+}
+
+static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload;
+
+ convert_dus(&du->dus);
+ convert_agg(&du->agg);
+
+ if (!client->disk_stats_shown) {
+ client->disk_stats_shown = 1;
+ log_info("\nDisk stats (read/write):\n");
+ }
+
+ print_disk_util(&du->dus, &du->agg, terse_output);
+}
+
static void convert_jobs_eta(struct jobs_eta *je)
{
int i;
flist_for_each(entry, &client->cmd_list) {
icmd = flist_entry(entry, struct fio_net_int_cmd, list);
- if (cmd->tag == (uint64_t) icmd)
+ if (cmd->tag == (uintptr_t) icmd)
break;
icmd = NULL;
static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
- struct client_eta *eta = (struct client_eta *) cmd->tag;
+ struct client_eta *eta = (struct client_eta *) (uintptr_t) cmd->tag;
dprint(FD_NET, "client: got eta tag %p, %d\n", eta, eta->pending);
{
struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
const char *os, *arch;
+ char bit[16];
os = fio_get_os_string(probe->os);
if (!os)
if (!arch)
os = "unknown";
- log_info("hostname=%s, be=%u, os=%s, arch=%s, fio=%u.%u.%u\n",
- probe->hostname, probe->bigendian, os, arch, probe->fio_major,
- probe->fio_minor, probe->fio_patch);
+ sprintf(bit, "%d-bit", probe->bpp * 8);
+
+ log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n",
+ probe->hostname, probe->bigendian, bit, os, arch,
+ probe->fio_major, probe->fio_minor, probe->fio_patch);
if (!client->name)
client->name = strdup((char *) probe->hostname);
}
+static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload;
+
+ client->state = Client_started;
+ client->jobs = le32_to_cpu(pdu->jobs);
+}
+
+static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
+
+ client->state = Client_stopped;
+ client->error = le32_to_cpu(pdu->error);
+
+ if (client->error)
+ log_info("client <%s>: exited with error %d\n", client->hostname, client->error);
+}
+
static int handle_client(struct fio_client *client)
{
struct fio_net_cmd *cmd;
free(cmd);
break;
}
+ case FIO_NET_CMD_DU:
+ handle_du(client, cmd);
+ free(cmd);
+ break;
case FIO_NET_CMD_TS:
handle_ts(cmd);
free(cmd);
handle_probe(client, cmd);
free(cmd);
break;
+ case FIO_NET_CMD_RUN:
+ client->state = Client_running;
+ free(cmd);
+ break;
case FIO_NET_CMD_START:
- client->state = Client_started;
+ handle_start(client, cmd);
free(cmd);
break;
case FIO_NET_CMD_STOP:
- client->state = Client_stopped;
+ handle_stop(client, cmd);
free(cmd);
break;
default:
skipped++;
continue;
}
+ if (client->state != Client_running)
+ continue;
assert(!client->eta_in_flight);
flist_add_tail(&client->eta_list, &eta_list);
client->eta_in_flight = eta;
fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_SEND_ETA,
- (uint64_t) eta, &client->cmd_list);
+ (uintptr_t) eta, &client->cmd_list);
}
while (skipped--)
struct fio_client *client;
struct flist_head *entry;
struct pollfd *pfds;
- int i, ret = 0;
+ int i, ret = 0, retval = 0;
gettimeofday(&eta_tv, NULL);
log_info("client: host=%s disconnected\n",
client->hostname);
remove_client(client);
- }
+ retval = 1;
+ } else if (client->error)
+ retval = 1;
}
}
free(pfds);
- return 0;
+ return retval;
}