diff mbox series

[04/19] perf stat: Split print_cgroup() function

Message ID	20221114230227.1255976-5-namhyung@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Sender: Namhyung Kim <namhyung@gmail.com> 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>, Athira Jajeev <atrajeev@linux.vnet.ibm.com> Subject: [PATCH 04/19] perf stat: Split print_cgroup() function Date: Mon, 14 Nov 2022 15:02:12 -0800 Message-Id: <20221114230227.1255976-5-namhyung@kernel.org> In-Reply-To: <20221114230227.1255976-1-namhyung@kernel.org> References: <20221114230227.1255976-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	perf stat: Improve perf stat output (v1) \| [PATCHSET,00/19] perf stat: Improve perf stat output (v1) [01/19] perf stat: Clear screen only if output file is a tty [02/19] perf stat: Split print_running() function [03/19] perf stat: Split print_noise_pct() function [04/19] perf stat: Split print_cgroup() function [05/19] perf stat: Split aggr_printout() function [06/19] perf stat: Factor out print_counter_value() function [07/19] perf stat: Handle bad events in abs_printout() [08/19] perf stat: Add before_metric argument [09/19] perf stat: Align cgroup names [10/19] perf stat: Split print_metric_headers() function [11/19] perf stat: Factor out prepare_interval() [12/19] perf stat: Cleanup interval print alignment [13/19] perf stat: Remove impossible condition [14/19] perf stat: Rework header display [15/19] perf stat: Move condition to print_footer() [16/19] perf stat: Factor out prefix display [17/19] perf stat: Factor out print_metric_{begin,end}() [18/19] perf stat: Support --for-each-cgroup and --metric-only [19/19] perf stat: Add print_aggr_cgroup() for --for-each-cgroup and --topdown

Commit Message

Namhyung Kim Nov. 14, 2022, 11:02 p.m. UTC

  Likewise, split print_cgroup() for each output mode.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/stat-display.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index a230f65efa62..af2a561eb20c 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -106,15 +106,32 @@  static void print_noise(struct perf_stat_config *config,
 	print_noise_pct(config, stddev_stats(&ps->res_stats), avg);
 }
 
+static void print_cgroup_std(struct perf_stat_config *config, const char *cgrp_name)
+{
+	fprintf(config->output, " %s", cgrp_name);
+}
+
+static void print_cgroup_csv(struct perf_stat_config *config, const char *cgrp_name)
+{
+	fprintf(config->output, "%s%s", config->csv_sep, cgrp_name);
+}
+
+static void print_cgroup_json(struct perf_stat_config *config, const char *cgrp_name)
+{
+	fprintf(config->output, "\"cgroup\" : \"%s\", ", cgrp_name);
+}
+
 static void print_cgroup(struct perf_stat_config *config, struct evsel *evsel)
 {
 	if (nr_cgroups) {
 		const char *cgrp_name = evsel->cgrp ? evsel->cgrp->name  : "";
 
 		if (config->json_output)
-			fprintf(config->output, "\"cgroup\" : \"%s\", ", cgrp_name);
+			print_cgroup_json(config, cgrp_name);
+		if (config->csv_output)
+			print_cgroup_csv(config, cgrp_name);
 		else
-			fprintf(config->output, "%s%s", config->csv_sep, cgrp_name);
+			print_cgroup_std(config, cgrp_name);
 	}
 }