From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-perf-users@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Zhengjun Xing <zhengjun.xing@linux.intel.com>,
James Clark <james.clark@arm.com>
Subject: [PATCH 9/9] perf stat: Consolidate condition to print metrics
Date: Mon, 7 Nov 2022 13:33:14 -0800 [thread overview]
Message-ID: <20221107213314.3239159-10-namhyung@kernel.org> (raw)
In-Reply-To: <20221107213314.3239159-1-namhyung@kernel.org>
The pm variable holds an appropriate function to print metrics for CSV
anf JSON already. So we can combine the if statement to simplify the
code a little bit. This also matches to the above condition for non-CSV
and non-JSON case.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/stat-display.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index a10af26c26ab..4d3999673dde 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -600,9 +600,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int
pm(config, &os, NULL, NULL, "", 0);
print_noise(config, counter, noise);
print_running(config, run, ena);
- if (config->csv_output)
- pm(config, &os, NULL, NULL, "", 0);
- else if (config->json_output)
+ if (config->csv_output || config->json_output)
pm(config, &os, NULL, NULL, "", 0);
return;
}
--
2.38.1.431.g37b22c650d-goog
next prev parent reply other threads:[~2022-11-07 21:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 21:33 [PATCHSET 0/9] perf stat: Cleanup perf stat output display (v1) Namhyung Kim
2022-11-07 21:33 ` [PATCH 1/9] perf stat: Fix crash with --per-node --metric-only in CSV mode Namhyung Kim
2022-11-08 20:50 ` Arnaldo Carvalho de Melo
2022-11-07 21:33 ` [PATCH 2/9] perf stat: Increase metric length to align outputs Namhyung Kim
2022-11-08 23:14 ` Ian Rogers
2022-11-07 21:33 ` [PATCH 3/9] perf stat: Clear screen only if output file is a tty Namhyung Kim
2022-11-08 23:16 ` Ian Rogers
2022-11-09 18:02 ` Namhyung Kim
2022-11-07 21:33 ` [PATCH 4/9] perf stat: Move common code in print_metric_headers() Namhyung Kim
2022-11-08 23:19 ` Ian Rogers
2022-11-09 18:04 ` Namhyung Kim
2022-11-07 21:33 ` [PATCH 5/9] perf stat: Fix --metric-only --json output Namhyung Kim
2022-11-08 20:45 ` Arnaldo Carvalho de Melo
2022-11-08 22:07 ` Namhyung Kim
2022-11-09 18:33 ` Arnaldo Carvalho de Melo
2022-11-09 1:26 ` Ian Rogers
2022-11-07 21:33 ` [PATCH 6/9] perf stat: Do not indent headers for JSON Namhyung Kim
2022-11-08 23:20 ` Ian Rogers
2022-11-07 21:33 ` [PATCH 7/9] perf stat: Add header for interval in JSON output Namhyung Kim
2022-11-08 23:22 ` Ian Rogers
2022-11-07 21:33 ` [PATCH 8/9] perf stat: Fix condition in print_interval() Namhyung Kim
2022-11-08 23:23 ` Ian Rogers
2022-11-07 21:33 ` Namhyung Kim [this message]
2022-11-08 23:23 ` [PATCH 9/9] perf stat: Consolidate condition to print metrics Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221107213314.3239159-10-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).