projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spelling error
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index c61301de99dd2bfbcb9c4d35b91108fa0ba276be..d502a4b34d4c57a060d96f3c24d4436f4a0bf9bb 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-226,13
+226,12
@@
static void fio_drain_client_text(struct fio_client *client)
if (!cmd)
break;
if (!cmd)
break;
- if (cmd->opcode
!
= FIO_NET_CMD_TEXT) {
-
free
(cmd);
- c
ontinue
;
+ if (cmd->opcode
=
= FIO_NET_CMD_TEXT) {
+
convert_text
(cmd);
+ c
lient->ops->text(client, cmd)
;
}
}
- convert_text(cmd);
- client->ops->text(client, cmd);
+ free(cmd);
} while (1);
}
} while (1);
}
@@
-348,7
+347,7
@@
err:
return NULL;
}
return NULL;
}
-int fio_client_add_ini_file(void *cookie, const char *ini_file,
int
remote)
+int fio_client_add_ini_file(void *cookie, const char *ini_file,
bool
remote)
{
struct fio_client *client = cookie;
struct client_file *cf;
{
struct fio_client *client = cookie;
struct client_file *cf;
@@
-790,7
+789,7
@@
static int __fio_client_send_local_ini(struct fio_client *client,
}
int fio_client_send_ini(struct fio_client *client, const char *filename,
}
int fio_client_send_ini(struct fio_client *client, const char *filename,
-
int
remote)
+
bool
remote)
{
int ret;
{
int ret;
@@
-817,6
+816,8
@@
int fio_clients_send_ini(const char *filename)
struct flist_head *entry, *tmp;
flist_for_each_safe(entry, tmp, &client_list) {
struct flist_head *entry, *tmp;
flist_for_each_safe(entry, tmp, &client_list) {
+ bool failed = false;
+
client = flist_entry(entry, struct fio_client, list);
if (client->nr_files) {
client = flist_entry(entry, struct fio_client, list);
if (client->nr_files) {
@@
-828,12
+829,13
@@
int fio_clients_send_ini(const char *filename)
cf = &client->files[i];
if (fio_client_send_cf(client, cf)) {
cf = &client->files[i];
if (fio_client_send_cf(client, cf)) {
+ failed = true;
remove_client(client);
break;
}
}
}
remove_client(client);
break;
}
}
}
- if (client->sent_job)
+ if (client->sent_job
|| failed
)
continue;
if (!filename || fio_client_send_ini(client, filename, 0))
remove_client(client);
continue;
if (!filename || fio_client_send_ini(client, filename, 0))
remove_client(client);
@@
-1461,7
+1463,6
@@
static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd,
return NULL;
#endif
ret = convert_iolog_gz(cmd, pdu);
return NULL;
#endif
ret = convert_iolog_gz(cmd, pdu);
- printf("compressed iolog, %p\n", ret);
if (!ret) {
log_err("fio: failed decompressing log\n");
return NULL;
if (!ret) {
log_err("fio: failed decompressing log\n");
return NULL;