projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "client: respect terse output on client <--> backend relationship"
[fio.git]
/
client.c
diff --git
a/client.c
b/client.c
index 31c7c6495790e91018cface694803ff9bfcefa1e..f7726f7469c75fc54b2c9f06ff27c5d26278836e 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-1059,9
+1059,6
@@
static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd)
struct flist_head *opt_list = NULL;
struct json_object *tsobj;
struct flist_head *opt_list = NULL;
struct json_object *tsobj;
- if (output_format & FIO_OUTPUT_TERSE)
- return;
-
if (client->opt_lists && p->ts.thread_number <= client->jobs)
opt_list = &client->opt_lists[p->ts.thread_number - 1];
if (client->opt_lists && p->ts.thread_number <= client->jobs)
opt_list = &client->opt_lists[p->ts.thread_number - 1];
@@
-1098,9
+1095,6
@@
static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
{
struct group_run_stats *gs = (struct group_run_stats *) cmd->payload;
- if (output_format & FIO_OUTPUT_TERSE)
- return;
-
if (output_format & FIO_OUTPUT_NORMAL)
show_group_stats(gs, NULL);
}
if (output_format & FIO_OUTPUT_NORMAL)
show_group_stats(gs, NULL);
}
@@
-1144,13
+1138,17
@@
static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd)
const char *buf = (const char *) pdu->buf;
const char *name;
int fio_unused ret;
const char *buf = (const char *) pdu->buf;
const char *name;
int fio_unused ret;
+ struct buf_output out;
+
+ buf_output_init(&out);
name = client->name ? client->name : client->hostname;
if (!client->skip_newline && !(output_format & FIO_OUTPUT_TERSE))
name = client->name ? client->name : client->hostname;
if (!client->skip_newline && !(output_format & FIO_OUTPUT_TERSE))
- fprintf(f_out, "<%s> ", name);
- ret = fwrite(buf, pdu->buf_len, 1, f_out);
- fflush(f_out);
+ __log_buf(&out, "<%s> ", name);
+ __log_buf(&out, "%s", buf);
+ log_info_buf(out.buf, out.buflen);
+ buf_output_free(&out);
client->skip_newline = strchr(buf, '\n') == NULL;
}
client->skip_newline = strchr(buf, '\n') == NULL;
}
@@
-1191,9
+1189,6
@@
static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload;
{
struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload;
- if (output_format & FIO_OUTPUT_TERSE)
- return;
-
if (!client->disk_stats_shown) {
client->disk_stats_shown = true;
if (!(output_format & FIO_OUTPUT_JSON))
if (!client->disk_stats_shown) {
client->disk_stats_shown = true;
if (!(output_format & FIO_OUTPUT_JSON))
@@
-1206,6
+1201,8
@@
static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
duobj = json_array_last_value_object(du_array);
json_object_add_client_info(duobj, client);
}
duobj = json_array_last_value_object(du_array);
json_object_add_client_info(duobj, client);
}
+ if (output_format & FIO_OUTPUT_TERSE)
+ print_disk_util(&du->dus, &du->agg, 1, NULL);
if (output_format & FIO_OUTPUT_NORMAL)
print_disk_util(&du->dus, &du->agg, 0, NULL);
}
if (output_format & FIO_OUTPUT_NORMAL)
print_disk_util(&du->dus, &du->agg, 0, NULL);
}
@@
-1465,9
+1462,6
@@
static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
const char *os, *arch;
char bit[16];
const char *os, *arch;
char bit[16];
- if (output_format & FIO_OUTPUT_TERSE)
- return;
-
os = fio_get_os_string(probe->os);
if (!os)
os = "unknown";
os = fio_get_os_string(probe->os);
if (!os)
os = "unknown";