On Thu, Dec 22, 2022 at 04:03:23PM +0000, James Clark wrote:
Use the new perf_pmu__pathname_scnprintf() instead. No functional changes.
Signed-off-by: James Clark james.clark@arm.com
Reviewed-by: Leo Yan leo.yan@linaro.org
tools/perf/util/pmu.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index faaeec1e15aa..15b852b3c401 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -574,8 +574,6 @@ static void pmu_read_sysfs(void)
- Uncore PMUs have a "cpumask" file under sysfs. CPU PMUs (e.g. on arm/arm64)
- may have a "cpus" file.
*/ -#define SYS_TEMPLATE_ID "./bus/event_source/devices/%s/identifier"
static struct perf_cpu_map *pmu_cpumask(char *name) { struct perf_cpu_map *cpus; @@ -616,9 +614,9 @@ static char *pmu_id(const char *name) char path[PATH_MAX], *str; size_t len;
- snprintf(path, PATH_MAX, SYS_TEMPLATE_ID, name);
- perf_pmu__pathname_scnprintf(path, PATH_MAX, name, "identifier");
- if (sysfs__read_str(path, &str, &len) < 0)
- if (filename__read_str(path, &str, &len) < 0) return NULL;
str[len - 1] = 0; /* remove line feed */ @@ -864,16 +862,11 @@ pmu_find_alias_name(const char *name __maybe_unused) return NULL; } -static int pmu_max_precise(const char *name) +static int pmu_max_precise(struct perf_pmu *pmu) {
- char path[PATH_MAX]; int max_precise = -1;
- scnprintf(path, PATH_MAX,
"bus/event_source/devices/%s/caps/max_precise",name);- sysfs__read_int(path, &max_precise);
- perf_pmu__scan_file(pmu, "caps/max_precise", "%d", &max_precise); return max_precise;
} @@ -932,7 +925,7 @@ static struct perf_pmu *pmu_lookup(const char *lookup_name) pmu->is_uncore = pmu_is_uncore(name); if (pmu->is_uncore) pmu->id = pmu_id(name);
- pmu->max_precise = pmu_max_precise(name);
- pmu->max_precise = pmu_max_precise(pmu); pmu_add_cpu_aliases(&aliases, pmu); pmu_add_sys_aliases(&aliases, pmu);
2.25.1