projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add thread_segments as needed
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index e8f6fd493121d6680df4bac67507b07b0d591fdc..29d8750a5b2b6948bc8206399d6a1be774a22a78 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-390,8
+390,6
@@
struct fio_client *fio_client_add_explicit(struct client_ops *ops,
client = get_new_client();
client = get_new_client();
- client->hostname = strdup(hostname);
-
if (type == Fio_client_socket)
client->is_sock = true;
else {
if (type == Fio_client_socket)
client->is_sock = true;
else {
@@
-410,6
+408,7
@@
struct fio_client *fio_client_add_explicit(struct client_ops *ops,
client->ops = ops;
client->refs = 1;
client->type = ops->client_type;
client->ops = ops;
client->refs = 1;
client->type = ops->client_type;
+ client->hostname = strdup(hostname);
__fio_client_add_cmd_option(client, "fio");
__fio_client_add_cmd_option(client, "fio");
@@
-471,8
+470,10
@@
int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie)
&client->is_sock, &client->port,
&client->addr.sin_addr,
&client->addr6.sin6_addr,
&client->is_sock, &client->port,
&client->addr.sin_addr,
&client->addr6.sin6_addr,
- &client->ipv6))
+ &client->ipv6)) {
+ fio_put_client(client);
return -1;
return -1;
+ }
client->fd = -1;
client->ops = ops;
client->fd = -1;
client->ops = ops;
@@
-1037,10
+1038,10
@@
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
for (j = 0; j < FIO_IO_U_PLAT_NR; j++) {
dst->io_u_plat_high_prio[i][j] = le64_to_cpu(src->io_u_plat_high_prio[i][j]);
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
for (j = 0; j < FIO_IO_U_PLAT_NR; j++) {
dst->io_u_plat_high_prio[i][j] = le64_to_cpu(src->io_u_plat_high_prio[i][j]);
- dst->io_u_plat_
prio[i][j] = le64_to_cpu(src->io_u_plat
_prio[i][j]);
+ dst->io_u_plat_
low_prio[i][j] = le64_to_cpu(src->io_u_plat_low
_prio[i][j]);
}
convert_io_stat(&dst->clat_high_prio_stat[i], &src->clat_high_prio_stat[i]);
}
convert_io_stat(&dst->clat_high_prio_stat[i], &src->clat_high_prio_stat[i]);
- convert_io_stat(&dst->clat_
prio_stat[i], &src->clat
_prio_stat[i]);
+ convert_io_stat(&dst->clat_
low_prio_stat[i], &src->clat_low
_prio_stat[i]);
}
dst->ss_dur = le64_to_cpu(src->ss_dur);
}
dst->ss_dur = le64_to_cpu(src->ss_dur);
@@
-1140,37
+1141,27
@@
static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd)
static void handle_job_opt(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct cmd_job_option *pdu = (struct cmd_job_option *) cmd->payload;
static void handle_job_opt(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct cmd_job_option *pdu = (struct cmd_job_option *) cmd->payload;
- struct print_option *p;
-
- if (!job_opt_object)
- return;
pdu->global = le16_to_cpu(pdu->global);
pdu->truncated = le16_to_cpu(pdu->truncated);
pdu->groupid = le32_to_cpu(pdu->groupid);
pdu->global = le16_to_cpu(pdu->global);
pdu->truncated = le16_to_cpu(pdu->truncated);
pdu->groupid = le32_to_cpu(pdu->groupid);
- p = malloc(sizeof(*p));
- p->name = strdup((char *) pdu->name);
- if (pdu->value[0] != '\0')
- p->value = strdup((char *) pdu->value);
- else
- p->value = NULL;
-
if (pdu->global) {
if (pdu->global) {
- const char *pos = "";
+ if (!job_opt_object)
+ return;
- if (p->value)
- pos = p->value;
-
- json_object_add_value_string(job_opt_object, p->name, pos);
+ json_object_add_value_string(job_opt_object,
+ (const char *)pdu->name,
+ (const char *)pdu->value);
} else if (client->opt_lists) {
struct flist_head *opt_list = &client->opt_lists[pdu->groupid];
} else if (client->opt_lists) {
struct flist_head *opt_list = &client->opt_lists[pdu->groupid];
+ struct print_option *p;
+ p = malloc(sizeof(*p));
+ p->name = strdup((const char *)pdu->name);
+ p->value = pdu->value[0] ? strdup((const char *)pdu->value) :
+ NULL;
flist_add_tail(&p->list, opt_list);
flist_add_tail(&p->list, opt_list);
- } else {
- free(p->value);
- free(p->name);
- free(p);
}
}
}
}