static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd);
static void convert_text(struct fio_net_cmd *cmd);
+static void client_display_thread_status(struct jobs_eta *je);
struct client_ops fio_client_ops = {
.text = handle_text,
.group_stats = handle_gs,
.stop = handle_stop,
.start = handle_start,
- .eta = display_thread_status,
+ .eta = client_display_thread_status,
.probe = handle_probe,
.eta_msec = FIO_CLIENT_DEF_ETA_MSEC,
.client_type = FIO_CLIENT_TYPE_CLI,
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];
{
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);
}
name = client->name ? client->name : client->hostname;
- if (!client->skip_newline)
+ 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);
{
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;
- log_info("\nDisk stats (read/write):\n");
+ if (!(output_format & FIO_OUTPUT_JSON))
+ log_info("\nDisk stats (read/write):\n");
}
if (output_format & FIO_OUTPUT_JSON) {
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);
}
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";
sprintf(bit, "%d-bit", probe->bpp * 8);
probe->flags = le64_to_cpu(probe->flags);
- log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s, flags=%lx\n",
- probe->hostname, probe->bigendian, bit, os, arch,
- probe->fio_version, (unsigned long) probe->flags);
+ if (!(output_format & FIO_OUTPUT_JSON))
+ log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s, flags=%lx\n",
+ probe->hostname, probe->bigendian, bit, os, arch,
+ probe->fio_version, (unsigned long) probe->flags);
if (!client->name)
client->name = strdup((char *) probe->hostname);
free(pfds);
return retval || error_clients;
}
+
+static void client_display_thread_status(struct jobs_eta *je)
+{
+ if (!(output_format & FIO_OUTPUT_JSON))
+ display_thread_status(je);
+}