projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conditionally include <sys/shm.h> based on OS support. Define missing MAP_HUGETLB...
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index 50c17041bc189336688f97e99b45e210a80be4f4..0dc620dcdc5a965661fa7de0d544de3924e8dc2b 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-21,8
+21,8
@@
#include "hash.h"
struct client_eta {
#include "hash.h"
struct client_eta {
- struct jobs_eta eta;
unsigned int pending;
unsigned int pending;
+ struct jobs_eta eta;
};
struct fio_client {
};
struct fio_client {
@@
-47,9
+47,11
@@
struct fio_client {
int is_sock;
int disk_stats_shown;
unsigned int jobs;
int is_sock;
int disk_stats_shown;
unsigned int jobs;
+ unsigned int nr_stat;
int error;
int ipv6;
int sent_job;
int error;
int ipv6;
int sent_job;
+ int did_stat;
struct flist_head eta_list;
struct client_eta *eta_in_flight;
struct flist_head eta_list;
struct client_eta *eta_in_flight;
@@
-81,8
+83,9
@@
static FLIST_HEAD(arg_list);
static struct thread_stat client_ts;
static struct group_run_stats client_gs;
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 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)
#define FIO_CLIENT_HASH_BITS 7
#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
@@
-159,9
+162,11
@@
static void remove_client(struct fio_client *client)
if (client->ini_file)
free(client->ini_file);
if (client->ini_file)
free(client->ini_file);
+ if (!client->did_stat)
+ sum_stat_clients -= client->nr_stat;
+
free(client);
nr_clients--;
free(client);
nr_clients--;
- sum_stat_clients--;
}
static void put_client(struct fio_client *client)
}
static void put_client(struct fio_client *client)
@@
-262,7
+267,7
@@
int fio_client_add(const char *hostname, void **cookie)
static int fio_client_connect_ip(struct fio_client *client)
{
struct sockaddr *addr;
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) {
int fd, domain;
if (client->ipv6) {
@@
-299,7
+304,7
@@
static int fio_client_connect_ip(struct fio_client *client)
static int fio_client_connect_sock(struct fio_client *client)
{
struct sockaddr_un *addr = &client->addr_un;
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));
int fd;
memset(addr, 0, sizeof(*addr));
@@
-383,6
+388,14
@@
static void client_signal_handler(void)
act.sa_flags = SA_RESTART;
sigaction(SIGTERM, &act, NULL);
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;
memset(&act, 0, sizeof(act));
act.sa_handler = sig_show_status;
act.sa_flags = SA_RESTART;
@@
-582,8
+595,9
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->groupid = le32_to_cpu(src->groupid);
dst->pid = le32_to_cpu(src->pid);
dst->members = le32_to_cpu(src->members);
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]);
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]);
@@
-615,11
+629,11
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->io_u_lat_m[i] = le32_to_cpu(src->io_u_lat_m[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 (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_io_u[i] = le64_to_cpu(src->total_io_u[i]);
dst->short_io_u[i] = le64_to_cpu(src->short_io_u[i]);
}
@@
-627,7
+641,7
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->total_submit = le64_to_cpu(src->total_submit);
dst->total_complete = le64_to_cpu(src->total_complete);
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->io_bytes[i] = le64_to_cpu(src->io_bytes[i]);
dst->runtime[i] = le64_to_cpu(src->runtime[i]);
}
@@
-643,7
+657,7
@@
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
{
int i;
{
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->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]);
@@
-654,9
+668,10
@@
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
dst->kb_base = le32_to_cpu(src->kb_base);
dst->groupid = le32_to_cpu(src->groupid);
dst->kb_base = le32_to_cpu(src->kb_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;
{
struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
@@
-664,8
+679,9
@@
static void handle_ts(struct fio_net_cmd *cmd)
convert_gs(&p->rs, &p->rs);
show_thread_status(&p->ts, &p->rs);
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);
return;
sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
@@
-673,6
+689,7
@@
static void handle_ts(struct fio_net_cmd *cmd)
client_ts.members++;
client_ts.groupid = p->ts.groupid;
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");
if (++sum_stat_nr == sum_stat_clients) {
strcpy(client_ts.name, "All clients");
@@
-733,7
+750,7
@@
static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
log_info("\nDisk stats (read/write):\n");
}
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)
}
static void convert_jobs_eta(struct jobs_eta *je)
@@
-749,7
+766,7
@@
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);
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->rate[i] = le32_to_cpu(je->rate[i]);
je->iops[i] = le32_to_cpu(je->iops[i]);
}
@@
-772,7
+789,7
@@
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;
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];
}
dst->rate[i] += je->rate[i];
dst->iops[i] += je->iops[i];
}
@@
-862,6
+879,12
@@
static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
client->state = Client_started;
client->jobs = le32_to_cpu(pdu->jobs);
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)
}
static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
@@
-913,7
+936,7
@@
static int handle_client(struct fio_client *client)
free(cmd);
break;
case FIO_NET_CMD_TS:
free(cmd);
break;
case FIO_NET_CMD_TS:
- handle_ts(cmd);
+ handle_ts(c
lient, c
md);
free(cmd);
break;
case FIO_NET_CMD_GS:
free(cmd);
break;
case FIO_NET_CMD_GS:
@@
-1017,7
+1040,7
@@
static int fio_client_timed_out(void)
struct timeval tv;
int ret = 0;
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);
flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
@@
-1041,11
+1064,10
@@
int fio_handle_clients(void)
struct pollfd *pfds;
int i, ret = 0, retval = 0;
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));
pfds = malloc(nr_clients * sizeof(struct pollfd));
- sum_stat_clients = nr_clients;
init_thread_stat(&client_ts);
init_group_run_stat(&client_gs);
init_thread_stat(&client_ts);
init_group_run_stat(&client_gs);
@@
-1076,7
+1098,7
@@
int fio_handle_clients(void)
do {
struct timeval tv;
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));
if (mtime_since(&eta_tv, &tv) >= 900) {
request_client_etas();
memcpy(&eta_tv, &tv, sizeof(tv));