UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf header: Pass "cpu" pmu name while printing caps 

Avoid unnecessary conditional code to check if pmu name is NULL
or not by passing "cpu" pmu name to the printing function.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ananth Narayan <ananth.narayan@amd.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <rrichter@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Santosh Shukla <santosh.shukla@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: like.xu.linux@gmail.com
Cc: x86@kernel.org
Link: https://lore.kernel.org/r/20220604044519.594-4-ravi.bangoria@amd.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ravi Bangoria 2022-06-04 10:15:14 +05:30 committed by Arnaldo Carvalho de Melo
parent 3339ec44be
commit 2a12bef413
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/util/header.c
View File

@ -2058,17 +2058,11 @@ static void print_per_cpu_pmu_caps(FILE *fp, int nr_caps, char *cpu_pmu_caps,
char *str, buf[128]; char *str, buf[128];
if (!nr_caps) { if (!nr_caps) {
if (!pmu_name) fprintf(fp, "# %s pmu capabilities: not available\n", pmu_name);
fprintf(fp, "# cpu pmu capabilities: not available\n");
else
fprintf(fp, "# %s pmu capabilities: not available\n", pmu_name);
return; return;
} }
if (!pmu_name) scnprintf(buf, sizeof(buf), "# %s pmu capabilities: ", pmu_name);
scnprintf(buf, sizeof(buf), "# cpu pmu capabilities: ");
else
scnprintf(buf, sizeof(buf), "# %s pmu capabilities: ", pmu_name);
delimiter = buf; delimiter = buf;
@ -2085,7 +2079,7 @@ static void print_per_cpu_pmu_caps(FILE *fp, int nr_caps, char *cpu_pmu_caps,
static void print_cpu_pmu_caps(struct feat_fd *ff, FILE *fp) static void print_cpu_pmu_caps(struct feat_fd *ff, FILE *fp)
{ {
print_per_cpu_pmu_caps(fp, ff->ph->env.nr_cpu_pmu_caps, print_per_cpu_pmu_caps(fp, ff->ph->env.nr_cpu_pmu_caps,
ff->ph->env.cpu_pmu_caps, NULL); ff->ph->env.cpu_pmu_caps, (char *)"cpu");
} }
static void print_hybrid_cpu_pmu_caps(struct feat_fd *ff, FILE *fp) static void print_hybrid_cpu_pmu_caps(struct feat_fd *ff, FILE *fp)