This patch adds the option --append-terse to be able to request a
combination of any given selected output format AND terse output based
on the same data.
This will help all users that want to parse the terse data for further
use, but need to look into the logs every now and then which then should
be readable.
Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
.B \-\-minimal
Print statistics in a terse, semicolon-delimited format.
.TP
.B \-\-minimal
Print statistics in a terse, semicolon-delimited format.
.TP
+.B \-\-append-terse
+Print statistics in selected mode AND terse, semicolon-delimited format.
+.TP
.B \-\-version
Display version information and exit.
.TP
.B \-\-version
Display version information and exit.
.TP
running, without terminating the job. To do that, send fio the \fBUSR1\fR
signal.
.SH TERSE OUTPUT
running, without terminating the job. To do that, send fio the \fBUSR1\fR
signal.
.SH TERSE OUTPUT
-If the \fB\-\-minimal\fR option is given, the results will be printed in a
-semicolon-delimited format suitable for scripted use - a job description
-(if provided) follows on a new line. Note that the first
+If the \fB\-\-minimal\fR / \fB\-\-append-terse\fR options are given, the
+results will be printed/appended in a semicolon-delimited format suitable for
+scripted use.
+A job description (if provided) follows on a new line. Note that the first
number in the line is the version number. If the output has to be changed
for some reason, this number will be incremented by 1 to signify that
change. The fields are:
number in the line is the version number. If the output has to be changed
for some reason, this number will be incremented by 1 to signify that
change. The fields are:
extern int shm_id;
extern int groupid;
extern int output_format;
extern int shm_id;
extern int groupid;
extern int output_format;
+extern int append_terse_output;
extern int temp_stall_ts;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int temp_stall_ts;
extern uintptr_t page_mask, page_size;
extern int read_only;
int exitall_on_terminate = 0;
int output_format = FIO_OUTPUT_NORMAL;
int exitall_on_terminate = 0;
int output_format = FIO_OUTPUT_NORMAL;
+int append_terse_output = 0;
int eta_print = FIO_ETA_AUTO;
int eta_new_line = 0;
FILE *f_out = NULL;
int eta_print = FIO_ETA_AUTO;
int eta_new_line = 0;
FILE *f_out = NULL;
.has_arg = optional_argument,
.val = 'F' | FIO_CLIENT_FLAG,
},
.has_arg = optional_argument,
.val = 'F' | FIO_CLIENT_FLAG,
},
+ {
+ .name = (char *) "append-terse",
+ .has_arg = optional_argument,
+ .val = 'f',
+ },
{
.name = (char *) "version",
.has_arg = no_argument,
{
.name = (char *) "version",
.has_arg = no_argument,
else
output_format = FIO_OUTPUT_NORMAL;
break;
else
output_format = FIO_OUTPUT_NORMAL;
break;
+ case 'f':
+ append_terse_output = 1;
+ break;
case 'h':
if (!cur_client) {
usage(argv[0]);
case 'h':
if (!cur_client) {
usage(argv[0]);
show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
}
show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
}
+ if ( !(output_format == FIO_OUTPUT_TERSE) && append_terse_output) {
+ log_info("\nAdditional Terse Output:\n");
+
+ for (i = 0; i < nr_ts; i++) {
+ ts = &threadstats[i];
+ rs = &runstats[ts->groupid];
+ show_thread_status_terse(ts, rs);
+ }
+ }
+
log_info_flush();
free(runstats);
free(threadstats);
log_info_flush();
free(runstats);
free(threadstats);