Skip to content

Commit 7753440

Browse files
anakryikoAlexei Starovoitov
authored andcommitted
selftests/bpf: make veristat emit all stats in CSV mode by default
Make veristat distinguish between table and CSV output formats and use different default set of stats (columns) that are emitted. While for human-readable table output it doesn't make sense to output all known stats, it is very useful for CSV mode to record all possible data, so that it can later be queried and filtered in replay or comparison mode. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/r/20221103055304.2904589-8-andrii@kernel.org Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 1bb4ec8 commit 7753440

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

tools/testing/selftests/bpf/veristat.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,15 @@ static const struct stat_specs default_output_spec = {
501501
},
502502
};
503503

504+
static const struct stat_specs default_csv_output_spec = {
505+
.spec_cnt = 9,
506+
.ids = {
507+
FILE_NAME, PROG_NAME, VERDICT, DURATION,
508+
TOTAL_INSNS, TOTAL_STATES, PEAK_STATES,
509+
MAX_STATES_PER_INSN, MARK_READ_MAX_LEN,
510+
},
511+
};
512+
504513
static const struct stat_specs default_sort_spec = {
505514
.spec_cnt = 2,
506515
.ids = {
@@ -1561,8 +1570,12 @@ int main(int argc, char **argv)
15611570
if (env.verbose && env.log_level == 0)
15621571
env.log_level = 1;
15631572

1564-
if (env.output_spec.spec_cnt == 0)
1565-
env.output_spec = default_output_spec;
1573+
if (env.output_spec.spec_cnt == 0) {
1574+
if (env.out_fmt == RESFMT_CSV)
1575+
env.output_spec = default_csv_output_spec;
1576+
else
1577+
env.output_spec = default_output_spec;
1578+
}
15661579
if (env.sort_spec.spec_cnt == 0)
15671580
env.sort_spec = default_sort_spec;
15681581

0 commit comments

Comments
 (0)