projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: disable percentiles when latency gathering is disabled
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index 3b54bfdfe6e183b5b0428d0b0fb09b2db5e0fe79..18247ef6b9bd277c0e66a980b3a49679aa4f1173 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-1834,6
+1834,9
@@
static void request_client_etas(struct client_ops *ops)
struct client_eta *eta;
int skipped = 0;
struct client_eta *eta;
int skipped = 0;
+ if (eta_print == FIO_ETA_NEVER)
+ return;
+
dprint(FD_NET, "client: request eta (%d)\n", nr_clients);
eta = calloc(1, sizeof(*eta) + __THREAD_RUNSTR_SZ(REAL_MAX_JOBS));
dprint(FD_NET, "client: request eta (%d)\n", nr_clients);
eta = calloc(1, sizeof(*eta) + __THREAD_RUNSTR_SZ(REAL_MAX_JOBS));
@@
-1903,16
+1906,19
@@
static int client_check_cmd_timeout(struct fio_client *client,
int ret = 0;
flist_for_each_safe(entry, tmp, &client->cmd_list) {
int ret = 0;
flist_for_each_safe(entry, tmp, &client->cmd_list) {
+ unsigned int op;
+
reply = flist_entry(entry, struct fio_net_cmd_reply, list);
if (mtime_since(&reply->ts, now) < FIO_NET_CLIENT_TIMEOUT)
continue;
reply = flist_entry(entry, struct fio_net_cmd_reply, list);
if (mtime_since(&reply->ts, now) < FIO_NET_CLIENT_TIMEOUT)
continue;
+ op = reply->opcode;
if (!handle_cmd_timeout(client, reply))
continue;
log_err("fio: client %s, timeout on cmd %s\n", client->hostname,
if (!handle_cmd_timeout(client, reply))
continue;
log_err("fio: client %s, timeout on cmd %s\n", client->hostname,
- fio_server_op(
reply->opcode
));
+ fio_server_op(
op
));
ret = 1;
}
ret = 1;
}
@@
-1994,7
+2000,7
@@
int fio_handle_clients(struct client_ops *ops)
int timeout;
fio_gettime(&ts, NULL);
int timeout;
fio_gettime(&ts, NULL);
- if (
mtime_since(&eta_ts, &ts) >= 900
) {
+ if (
eta_time_within_slack(mtime_since(&eta_ts, &ts))
) {
request_client_etas(ops);
memcpy(&eta_ts, &ts, sizeof(ts));
request_client_etas(ops);
memcpy(&eta_ts, &ts, sizeof(ts));