#include "hash.h"
struct client_eta {
- struct jobs_eta eta;
unsigned int pending;
+ struct jobs_eta eta;
};
struct fio_client {
int is_sock;
int disk_stats_shown;
unsigned int jobs;
+ unsigned int nr_stat;
int error;
int ipv6;
int sent_job;
+ int did_stat;
struct flist_head eta_list;
struct client_eta *eta_in_flight;
uint16_t argc;
char **argv;
+
+ char **ini_file;
+ unsigned int nr_ini_file;
};
static struct timeval eta_tv;
static struct thread_stat client_ts;
static struct group_run_stats client_gs;
-static int sum_stat_clients;
+static int sum_stat_clients = 0;
static int sum_stat_nr;
+static int do_output_all_clients;
#define FIO_CLIENT_HASH_BITS 7
#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
free(client->argv);
if (client->name)
free(client->name);
+ while (client->nr_ini_file)
+ free(client->ini_file[--client->nr_ini_file]);
+ if (client->ini_file)
+ free(client->ini_file);
+
+ if (!client->did_stat)
+ sum_stat_clients -= client->nr_stat;
free(client);
nr_clients--;
- sum_stat_clients--;
}
static void put_client(struct fio_client *client)
}
}
+void fio_client_add_ini_file(void *cookie, const char *ini_file)
+{
+ struct fio_client *client = cookie;
+ size_t new_size;
+
+ dprint(FD_NET, "client <%s>: add ini %s\n", client->hostname, ini_file);
+
+ new_size = (client->nr_ini_file + 1) * sizeof(char *);
+ client->ini_file = realloc(client->ini_file, new_size);
+ client->ini_file[client->nr_ini_file] = strdup(ini_file);
+ client->nr_ini_file++;
+}
+
int fio_client_add(const char *hostname, void **cookie)
{
struct fio_client *existing = *cookie;
static int fio_client_connect_ip(struct fio_client *client)
{
struct sockaddr *addr;
- fio_socklen_t socklen;
+ socklen_t socklen;
int fd, domain;
if (client->ipv6) {
static int fio_client_connect_sock(struct fio_client *client)
{
struct sockaddr_un *addr = &client->addr_un;
- fio_socklen_t len;
+ socklen_t len;
int fd;
memset(addr, 0, sizeof(*addr));
act.sa_flags = SA_RESTART;
sigaction(SIGTERM, &act, NULL);
+/* Windows uses SIGBREAK as a quit signal from other applications */
+#ifdef WIN32
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = sig_int;
+ act.sa_flags = SA_RESTART;
+ sigaction(SIGBREAK, &act, NULL);
+#endif
+
memset(&act, 0, sizeof(act));
act.sa_handler = sig_show_status;
act.sa_flags = SA_RESTART;
flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
- if (fio_client_send_ini(client, filename))
+ if (client->nr_ini_file) {
+ int i;
+
+ for (i = 0; i < client->nr_ini_file; i++) {
+ const char *ini = client->ini_file[i];
+
+ if (fio_client_send_ini(client, ini)) {
+ remove_client(client);
+ break;
+ }
+ }
+ } else if (!filename || fio_client_send_ini(client, filename))
remove_client(client);
client->sent_job = 1;
dst->groupid = le32_to_cpu(src->groupid);
dst->pid = le32_to_cpu(src->pid);
dst->members = le32_to_cpu(src->members);
+ dst->unified_rw_rep = le32_to_cpu(src->unified_rw_rep);
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; 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]);
dst->io_u_lat_m[i] = le32_to_cpu(src->io_u_lat_m[i]);
}
- for (i = 0; i < 2; i++)
+ for (i = 0; i < DDIR_RWDIR_CNT; 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++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
dst->total_io_u[i] = le64_to_cpu(src->total_io_u[i]);
dst->short_io_u[i] = le64_to_cpu(src->short_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++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
dst->io_bytes[i] = le64_to_cpu(src->io_bytes[i]);
dst->runtime[i] = le64_to_cpu(src->runtime[i]);
}
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);
+ dst->unit_base = le32_to_cpu(src->unit_base);
}
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
{
int i;
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; 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->kb_base = le32_to_cpu(src->kb_base);
+ dst->unit_base = le32_to_cpu(src->unit_base);
dst->groupid = le32_to_cpu(src->groupid);
+ dst->unified_rw_rep = le32_to_cpu(src->unified_rw_rep);
}
-static void handle_ts(struct fio_net_cmd *cmd)
+static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
convert_gs(&p->rs, &p->rs);
show_thread_status(&p->ts, &p->rs);
+ client->did_stat = 1;
- if (sum_stat_clients == 1)
+ if (!do_output_all_clients)
return;
sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
client_ts.members++;
client_ts.groupid = p->ts.groupid;
+ client_ts.unified_rw_rep = p->ts.unified_rw_rep;
if (++sum_stat_nr == sum_stat_clients) {
strcpy(client_ts.name, "All clients");
log_info("\nDisk stats (read/write):\n");
}
- print_disk_util(&du->dus, &du->agg, terse_output);
+ print_disk_util(&du->dus, &du->agg, output_format == FIO_OUTPUT_TERSE);
}
static void convert_jobs_eta(struct jobs_eta *je)
je->m_iops = le32_to_cpu(je->m_iops);
je->t_iops = le32_to_cpu(je->t_iops);
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
je->rate[i] = le32_to_cpu(je->rate[i]);
je->iops[i] = le32_to_cpu(je->iops[i]);
}
je->elapsed_sec = le64_to_cpu(je->elapsed_sec);
je->eta_sec = le64_to_cpu(je->eta_sec);
je->is_pow2 = le32_to_cpu(je->is_pow2);
+ je->unit_base = le32_to_cpu(je->unit_base);
}
static void sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
dst->m_iops += je->m_iops;
dst->t_iops += je->t_iops;
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
dst->rate[i] += je->rate[i];
dst->iops[i] += je->iops[i];
}
client->state = Client_started;
client->jobs = le32_to_cpu(pdu->jobs);
+ client->nr_stat = le32_to_cpu(pdu->stat_outputs);
+
+ if (sum_stat_clients > 1)
+ do_output_all_clients = 1;
+
+ sum_stat_clients += client->nr_stat;
}
static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
free(cmd);
break;
case FIO_NET_CMD_TS:
- handle_ts(cmd);
+ handle_ts(client, cmd);
free(cmd);
break;
case FIO_NET_CMD_GS:
struct timeval tv;
int ret = 0;
- gettimeofday(&tv, NULL);
+ fio_gettime(&tv, NULL);
flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
struct pollfd *pfds;
int i, ret = 0, retval = 0;
- gettimeofday(&eta_tv, NULL);
+ fio_gettime(&eta_tv, NULL);
pfds = malloc(nr_clients * sizeof(struct pollfd));
- sum_stat_clients = nr_clients;
init_thread_stat(&client_ts);
init_group_run_stat(&client_gs);
do {
struct timeval tv;
- gettimeofday(&tv, NULL);
+ fio_gettime(&tv, NULL);
if (mtime_since(&eta_tv, &tv) >= 900) {
request_client_etas();
memcpy(&eta_tv, &tv, sizeof(tv));
projects / fio.git / blobdiff