projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfio
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index a9b63e2a66e38b4dc6e313c80ad8a89c3c428ca0..9cbbcf66734877dd79d32fa284e2d7d3f4bb7a3d 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-55,6
+55,7
@@
struct group_run_stats client_gs;
int sum_stat_clients;
static int sum_stat_nr;
int sum_stat_clients;
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)
@@
-116,6
+117,9
@@
void fio_put_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);
}
free(client);
}
@@
-142,8
+146,6
@@
static void remove_client(struct fio_client *client)
client->ops->removed(client);
nr_clients--;
client->ops->removed(client);
nr_clients--;
- sum_stat_clients--;
-
fio_put_client(client);
}
fio_put_client(client);
}
@@
-437,6
+439,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;
@@
-690,7
+700,7
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->pid = le32_to_cpu(src->pid);
dst->members = le32_to_cpu(src->members);
dst->pid = le32_to_cpu(src->pid);
dst->members = le32_to_cpu(src->members);
- 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]);
@@
-722,7
+732,7
@@
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]);
@@
-734,7
+744,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]);
}
@@
-750,7
+760,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]);
@@
-768,8
+778,9
@@
static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
show_thread_status(&p->ts, &p->rs);
struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
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);
@@
-850,7
+861,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)
@@
-862,11
+873,11
@@
static void convert_jobs_eta(struct jobs_eta *je)
je->nr_pending = le32_to_cpu(je->nr_pending);
je->files_open = le32_to_cpu(je->files_open);
je->nr_pending = le32_to_cpu(je->nr_pending);
je->files_open = le32_to_cpu(je->files_open);
- for (i = 0; i <
2
; i++) {
- je->m_rate[i]
= le32_to_cpu(je->m_rate[i]);
- je->t_rate[i]
= le32_to_cpu(je->t_rate[i]);
- je->m_iops[i]
= le32_to_cpu(je->m_iops[i]);
- je->t_iops[i]
= le32_to_cpu(je->t_iops[i]);
+ for (i = 0; i <
DDIR_RWDIR_CNT
; i++) {
+ je->m_rate[i] = le32_to_cpu(je->m_rate[i]);
+ je->t_rate[i] = le32_to_cpu(je->t_rate[i]);
+ je->m_iops[i] = le32_to_cpu(je->m_iops[i]);
+ je->t_iops[i] = le32_to_cpu(je->t_iops[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]);
}
@@
-886,7
+897,7
@@
void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
dst->nr_pending += je->nr_pending;
dst->files_open += je->files_open;
dst->nr_pending += je->nr_pending;
dst->files_open += je->files_open;
- for (i = 0; i <
2
; i++) {
+ for (i = 0; i <
DDIR_RWDIR_CNT
; i++) {
dst->m_rate[i] += je->m_rate[i];
dst->t_rate[i] += je->t_rate[i];
dst->m_iops[i] += je->m_iops[i];
dst->m_rate[i] += je->m_rate[i];
dst->t_rate[i] += je->t_rate[i];
dst->m_iops[i] += je->m_iops[i];
@@
-1008,7
+1019,13
@@
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;
struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload;
client->state = Client_started;
- client->jobs = pdu->jobs;
+ 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)
@@
-1337,7
+1354,6
@@
int fio_handle_clients(struct client_ops *ops)
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);