Commit e45ad701 authored by John Garry's avatar John Garry Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu: Refactor pmu_add_cpu_aliases() 



Create pmu_add_cpu_aliases_map() from pmu_add_cpu_aliases(), so the caller
can pass the map; the pmu-events test would use this since there would
be no CPUID matching to a mapfile there.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: James Clark <james.clark@arm.com>
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: linuxarm@huawei.com
Link: http://lore.kernel.org/lkml/1584442939-8911-4-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d8447808

tools/perf/util/pmu.c

+13 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "pmu.h"

#include "parse-events.h"

#include "header.h"

#include "pmu-events/pmu-events.h"

#include "string2.h"

#include "strbuf.h"

#include "fncache.h"
@@ -744,16 +743,11 @@ out: 
 * to the current running CPU. Then, add all PMU events from that table

 * as aliases.

 */

static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)

void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,

			     struct pmu_events_map *map)

{

	int i;

	struct pmu_events_map *map;

	const char *name = pmu->name;



	map = perf_pmu__find_map(pmu);

	if (!map)

		return;



	/*

	 * Found a matching PMU events table. Create aliases

	 */
@@ -788,6 +782,17 @@ new_alias: 
	}

}



static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)

{

	struct pmu_events_map *map;



	map = perf_pmu__find_map(pmu);

	if (!map)

		return;



	pmu_add_cpu_aliases_map(head, pmu, map);

}



struct perf_event_attr * __weak

perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)

{

tools/perf/util/pmu.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/perf_event.h>

#include <stdbool.h>

#include "parse-events.h"

#include "pmu-events/pmu-events.h"



struct perf_evsel_config_term;
@@ -97,6 +98,8 @@ int perf_pmu__scan_file(struct perf_pmu *pmu, const char *name, const char *fmt, 
int perf_pmu__test(void);



struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu);

void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,

			     struct pmu_events_map *map);



struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE