projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio.1,HOWTO: keep 'iodepth_batch' option in sync
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index 3cb7c1c50a92f27706da48f5d4ce64ccb7ca6b59..147ee38969d09fd146bd4754288a028041a311ee 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-62,6
+62,8
@@
static struct json_object *root = NULL;
static struct json_array *clients_array = NULL;
static struct json_array *du_array = NULL;
static struct json_array *clients_array = NULL;
static struct json_array *du_array = NULL;
+static int error_clients;
+
#define FIO_CLIENT_HASH_BITS 7
#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
#define FIO_CLIENT_HASH_MASK (FIO_CLIENT_HASH_SZ - 1)
#define FIO_CLIENT_HASH_BITS 7
#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
#define FIO_CLIENT_HASH_MASK (FIO_CLIENT_HASH_SZ - 1)
@@
-176,9
+178,23
@@
void fio_put_client(struct fio_client *client)
if (!client->did_stat)
sum_stat_clients--;
if (!client->did_stat)
sum_stat_clients--;
+ if (client->error)
+ error_clients++;
+
free(client);
}
free(client);
}
+static int fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn)
+{
+ if (!--eta->pending) {
+ eta_fn(&eta->eta);
+ free(eta);
+ return 0;
+ }
+
+ return 1;
+}
+
static void remove_client(struct fio_client *client)
{
assert(client->refs);
static void remove_client(struct fio_client *client)
{
assert(client->refs);
@@
-380,6
+396,7
@@
static const char *server_name(struct fio_client *client, char *buf,
static void probe_client(struct fio_client *client)
{
struct cmd_client_probe_pdu pdu;
static void probe_client(struct fio_client *client)
{
struct cmd_client_probe_pdu pdu;
+ const char *sname;
uint64_t tag;
char buf[64];
uint64_t tag;
char buf[64];
@@
-391,7
+408,9
@@
static void probe_client(struct fio_client *client)
pdu.flags = 0;
#endif
pdu.flags = 0;
#endif
- strcpy((char *) pdu.server, server_name(client, buf, sizeof(buf)));
+ sname = server_name(client, buf, sizeof(buf));
+ memset(pdu.server, 0, sizeof(pdu.server));
+ strncpy((char *) pdu.server, sname, sizeof(pdu.server) - 1);
fio_net_send_cmd(client->fd, FIO_NET_CMD_PROBE, &pdu, sizeof(pdu), &tag, &client->cmd_list);
}
fio_net_send_cmd(client->fd, FIO_NET_CMD_PROBE, &pdu, sizeof(pdu), &tag, &client->cmd_list);
}
@@
-883,6
+902,10
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->latency_target = le64_to_cpu(src->latency_target);
dst->latency_window = le64_to_cpu(src->latency_window);
dst->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(src->latency_percentile.u.i));
dst->latency_target = le64_to_cpu(src->latency_target);
dst->latency_window = le64_to_cpu(src->latency_window);
dst->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(src->latency_percentile.u.i));
+
+ dst->nr_block_infos = le64_to_cpu(src->nr_block_infos);
+ for (i = 0; i < dst->nr_block_infos; i++)
+ dst->block_infos[i] = le32_to_cpu(src->block_infos[i]);
}
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
}
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
@@
-1079,14
+1102,6
@@
void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
strcpy((char *) dst->run_str, (char *) je->run_str);
}
strcpy((char *) dst->run_str, (char *) je->run_str);
}
-void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn)
-{
- if (!--eta->pending) {
- eta_fn(&eta->eta);
- free(eta);
- }
-}
-
static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct fio_net_cmd_reply *reply = NULL;
static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct fio_net_cmd_reply *reply = NULL;
@@
-1482,9
+1497,15
@@
int fio_handle_client(struct fio_client *client)
break;
case FIO_NET_CMD_VTRIGGER: {
struct all_io_list *pdu = (struct all_io_list *) cmd->payload;
break;
case FIO_NET_CMD_VTRIGGER: {
struct all_io_list *pdu = (struct all_io_list *) cmd->payload;
- char buf[64];
+ char buf[128];
+ int off = 0;
+
+ if (aux_path) {
+ strcpy(buf, aux_path);
+ off = strlen(buf);
+ }
- __verify_save_state(pdu, server_name(client,
buf, sizeof(buf)
));
+ __verify_save_state(pdu, server_name(client,
&buf[off], sizeof(buf) - off
));
exec_trigger(trigger_cmd);
break;
}
exec_trigger(trigger_cmd);
break;
}
@@
-1561,8
+1582,10
@@
static void request_client_etas(struct client_ops *ops)
(uintptr_t) eta, &client->cmd_list);
}
(uintptr_t) eta, &client->cmd_list);
}
- while (skipped--)
- fio_client_dec_jobs_eta(eta, ops->eta);
+ while (skipped--) {
+ if (!fio_client_dec_jobs_eta(eta, ops->eta))
+ break;
+ }
dprint(FD_NET, "client: requested eta tag %p\n", eta);
}
dprint(FD_NET, "client: requested eta tag %p\n", eta);
}
@@
-1613,6
+1636,7
@@
static int fio_check_clients_timed_out(void)
else
log_err("fio: client %s timed out\n", client->hostname);
else
log_err("fio: client %s timed out\n", client->hostname);
+ client->error = ETIMEDOUT;
remove_client(client);
ret = 1;
}
remove_client(client);
ret = 1;
}
@@
-1706,5
+1730,5
@@
int fio_handle_clients(struct client_ops *ops)
fio_client_json_fini();
free(pfds);
fio_client_json_fini();
free(pfds);
- return retval;
+ return retval
|| error_clients
;
}
}