aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNamhyung Kim <[email protected]>2022-11-07 13:33:13 -0800
committerArnaldo Carvalho de Melo <[email protected]>2022-11-14 13:21:19 -0300
commitf1db5a1d1d4de248534567fd95efa570bc693f73 (patch)
tree4a95dddd783cee8985528ecc08129d0bf9e742cf
parent1cc7642abba7b281ecd836bfb56fc6dedac32555 (diff)
perf stat: Fix condition in print_interval()
The num_print_interval and config->interval_clear should be checked together like other places like later in the function. Otherwise, the --interval-clear option could print the headers for the CSV or JSON output unnecessarily. Signed-off-by: Namhyung Kim <[email protected]> Acked-by: Ian Rogers <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Xing Zhengjun <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/stat-display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 2a08c66121ec..7b2ec400813e 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -900,8 +900,8 @@ static void print_interval(struct perf_stat_config *config,
sprintf(prefix, "{\"interval\" : %lu.%09lu}", (unsigned long)
ts->tv_sec, ts->tv_nsec);
- if ((num_print_interval == 0 && !config->csv_output && !config->json_output)
- || config->interval_clear) {
+ if ((num_print_interval == 0 || config->interval_clear) &&
+ !config->csv_output && !config->json_output) {
switch (config->aggr_mode) {
case AGGR_NODE:
fprintf(output, "# time node cpus");