};
static FLIST_HEAD(client_list);
-static unsigned int nr_clients;
static struct fio_client *find_client_by_fd(int fd)
{
return NULL;
}
+#if 0
static struct fio_client *find_client_by_name(const char *name)
{
struct fio_client *client;
return NULL;
}
+#endif
static void remove_client(struct fio_client *client)
{
- printf("remove client %s\n", client->hostname);
+ dprint(FD_NET, "removed client <%s>\n", client->hostname);
flist_del(&client->list);
nr_clients--;
free(client->hostname);
free(client);
}
-int fio_client_connect(const char *host)
+void fio_client_add(const char *hostname)
{
struct fio_client *client;
- int fd;
+ dprint(FD_NET, "added client <%s>\n", hostname);
client = malloc(sizeof(*client));
+ memset(client, 0, sizeof(*client));
+ client->hostname = strdup(hostname);
+ client->fd = -1;
+ flist_add(&client->list, &client_list);
+ nr_clients++;
+}
+
+static int fio_client_connect(struct fio_client *client)
+{
+ int fd;
+
+ dprint(FD_NET, "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(host, &client->addr.sin_addr) != 1) {
+ if (inet_aton(client->hostname, &client->addr.sin_addr) != 1) {
struct hostent *hent;
- hent = gethostbyname(host);
+ hent = gethostbyname(client->hostname);
if (!hent) {
log_err("fio: gethostbyname: %s\n", strerror(errno));
return 1;
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 *) &client->addr, sizeof(client->addr)) < 0) {
log_err("fio: connect: %s\n", strerror(errno));
- free(client);
return 1;
}
- client->hostname = strdup(host);
- flist_add(&client->list, &client_list);
- nr_clients++;
client->fd = fd;
return 0;
}
+int fio_clients_connect(void)
+{
+ struct fio_client *client;
+ struct flist_head *entry, *tmp;
+ int ret;
+
+ flist_for_each_safe(entry, tmp, &client_list) {
+ client = flist_entry(entry, struct fio_client, list);
+
+ ret = fio_client_connect(client);
+ if (ret)
+ remove_client(client);
+ }
+
+ return !nr_clients;
+}
+
static int send_file_buf(struct fio_client *client, char *buf, off_t size)
{
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 *hostname, const char *filename)
+static int fio_client_send_ini(struct fio_client *client, 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;
- }
+ dprint(FD_NET, "send ini %s to %s\n", filename, client->hostname);
fd = open(filename, O_RDONLY);
if (fd < 0) {
return ret;
}
+int fio_clients_send_ini(const char *filename)
+{
+ struct fio_client *client;
+ struct flist_head *entry, *tmp;
+
+ flist_for_each_safe(entry, tmp, &client_list) {
+ client = flist_entry(entry, struct fio_client, list);
+
+ if (fio_client_send_ini(client, filename))
+ remove_client(client);
+ }
+
+ return !nr_clients;
+}
+
+static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
+{
+ dst->max_val = le64_to_cpu(src->max_val);
+ dst->min_val = le64_to_cpu(src->min_val);
+ dst->samples = le64_to_cpu(src->samples);
+ /* FIXME */
+ dst->mean = __le64_to_cpu(src->mean);
+ dst->S = __le64_to_cpu(src->S);
+}
+
+static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
+{
+ int i, j;
+
+ dst->error = le32_to_cpu(src->error);
+ dst->groupid = le32_to_cpu(src->groupid);
+ dst->pid = le32_to_cpu(src->pid);
+ dst->members = le32_to_cpu(src->members);
+
+ for (i = 0; i < 2; i++) {
+ convert_io_stat(&dst->clat_stat[i], &src->clat_stat[i]);
+ convert_io_stat(&dst->slat_stat[i], &src->slat_stat[i]);
+ convert_io_stat(&dst->lat_stat[i], &src->lat_stat[i]);
+ convert_io_stat(&dst->bw_stat[i], &src->bw_stat[i]);
+ }
+
+ dst->usr_time = le64_to_cpu(src->usr_time);
+ dst->sys_time = le64_to_cpu(src->sys_time);
+ dst->ctx = le64_to_cpu(src->ctx);
+ dst->minf = le64_to_cpu(src->minf);
+ dst->majf = le64_to_cpu(src->majf);
+ dst->clat_percentiles = le64_to_cpu(src->clat_percentiles);
+ dst->percentile_list = NULL;
+
+ for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
+ dst->io_u_map[i] = le32_to_cpu(src->io_u_map[i]);
+ dst->io_u_submit[i] = le32_to_cpu(src->io_u_submit[i]);
+ dst->io_u_complete[i] = le32_to_cpu(src->io_u_complete[i]);
+ }
+
+ for (i = 0; i < FIO_IO_U_LAT_U_NR; i++) {
+ dst->io_u_lat_u[i] = le32_to_cpu(src->io_u_lat_u[i]);
+ dst->io_u_lat_m[i] = le32_to_cpu(src->io_u_lat_m[i]);
+ }
+
+ for (i = 0; i < 2; i++)
+ for (j = 0; j < FIO_IO_U_PLAT_NR; j++)
+ dst->io_u_plat[i][j] = le32_to_cpu(src->io_u_plat[i][j]);
+
+ for (i = 0; i < 3; i++) {
+ dst->total_io_u[i] = le64_to_cpu(src->total_io_u[i]);
+ dst->short_io_u[i] = le64_to_cpu(src->total_io_u[i]);
+ }
+
+ dst->total_submit = le64_to_cpu(src->total_submit);
+ dst->total_complete = le64_to_cpu(src->total_complete);
+
+ for (i = 0; i < 2; i++) {
+ dst->io_bytes[i] = le64_to_cpu(src->io_bytes[i]);
+ dst->runtime[i] = le64_to_cpu(src->runtime[i]);
+ }
+
+ dst->total_run_time = le64_to_cpu(src->total_run_time);
+ dst->continue_on_error = le16_to_cpu(src->continue_on_error);
+ dst->total_err_count = le64_to_cpu(src->total_err_count);
+ dst->first_error = le32_to_cpu(src->first_error);
+ dst->kb_base = le32_to_cpu(src->kb_base);
+}
+
+static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ dst->max_run[i] = le64_to_cpu(src->max_run[i]);
+ dst->min_run[i] = le64_to_cpu(src->min_run[i]);
+ dst->max_bw[i] = le64_to_cpu(src->max_bw[i]);
+ dst->min_bw[i] = le64_to_cpu(src->min_bw[i]);
+ dst->io_kb[i] = le64_to_cpu(src->io_kb[i]);
+ dst->agg[i] = le64_to_cpu(src->agg[i]);
+ }
+
+ dst->kb_base = le32_to_cpu(src->kb_base);
+ dst->groupid = le32_to_cpu(src->groupid);
+}
+
+static void handle_ts(struct fio_net_cmd *cmd)
+{
+ struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
+
+ convert_ts(&p->ts, &p->ts);
+ convert_gs(&p->rs, &p->rs);
+
+ show_thread_status(&p->ts, &p->rs);
+}
+
+static void handle_gs(struct fio_net_cmd *cmd)
+{
+ struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
+
+ convert_gs(gs, gs);
+ show_group_stats(gs);
+}
+
static int handle_client(struct fio_client *client)
{
struct fio_net_cmd *cmd;
+ int done = 0;
+
+ while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
+ dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
+ cmd->opcode);
- while ((cmd = fio_net_cmd_read(client->fd)) != NULL) {
- if (cmd->opcode == FIO_NET_CMD_ACK) {
+ switch (cmd->opcode) {
+ case FIO_NET_CMD_ACK:
free(cmd);
- continue;
- }
- if (cmd->opcode == FIO_NET_CMD_QUIT) {
+ break;
+ case FIO_NET_CMD_QUIT:
remove_client(client);
free(cmd);
+ done = 1;
break;
- }
- if (cmd->opcode != FIO_NET_CMD_TEXT) {
- printf("non text: %d\n", cmd->opcode);
+ case FIO_NET_CMD_TEXT:
+ fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
+ fflush(stdout);
free(cmd);
- continue;
+ break;
+ case FIO_NET_CMD_TS:
+ handle_ts(cmd);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_GS:
+ handle_gs(cmd);
+ free(cmd);
+ break;
+ default:
+ log_err("fio: unknown client op: %d\n", cmd->opcode);
+ free(cmd);
+ break;
}
- fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
- fflush(stdout);
- free(cmd);
+
+ if (done)
+ break;
}
return 0;
struct fio_client *client;
struct flist_head *entry;
struct pollfd *pfds;
- int i = 0, ret = 0;
+ int i, ret = 0;
pfds = malloc(nr_clients * sizeof(struct pollfd));
- flist_for_each(entry, &client_list) {
- client = flist_entry(entry, struct fio_client, list);
+ while (!exit_backend && nr_clients) {
+ i = 0;
+ flist_for_each(entry, &client_list) {
+ client = flist_entry(entry, struct fio_client, list);
- pfds[i].fd = client->fd;
- pfds[i].events = POLLIN;
- i++;
- }
+ pfds[i].fd = client->fd;
+ pfds[i].events = POLLIN;
+ i++;
+ }
+
+ assert(i == nr_clients);
- while (!exit_backend && nr_clients) {
ret = poll(pfds, nr_clients, 100);
if (ret < 0) {
if (errno == EINTR)
}
free(pfds);
-
return 0;
}