mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 12:21:22 -05:00
perf jevents: Allow multiple metricgroups.json files
Allow multiple metricgroups.json files by handling any file ending with metricgroups.json as a metricgroups file. Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Thomas Falcon <thomas.falcon@intel.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
@@ -640,7 +640,7 @@ def preprocess_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
|
||||
if not item.is_file() or not item.name.endswith('.json'):
|
||||
return
|
||||
|
||||
if item.name == 'metricgroups.json':
|
||||
if item.name.endswith('metricgroups.json'):
|
||||
metricgroup_descriptions = json.load(open(item.path))
|
||||
for mgroup in metricgroup_descriptions:
|
||||
assert len(mgroup) > 1, parents
|
||||
@@ -693,7 +693,7 @@ def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
|
||||
|
||||
# Ignore other directories. If the file name does not have a .json
|
||||
# extension, ignore it. It could be a readme.txt for instance.
|
||||
if not item.is_file() or not item.name.endswith('.json') or item.name == 'metricgroups.json':
|
||||
if not item.is_file() or not item.name.endswith('.json') or item.name.endswith('metricgroups.json'):
|
||||
return
|
||||
|
||||
add_events_table_entries(item, get_topic(item.name))
|
||||
|
||||
Reference in New Issue
Block a user