diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-10-18 20:34:53 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-18 20:35:34 +0300 |
commit | 46fc02f3932e37eb07ed7cd23ac96d464c6db55c (patch) | |
tree | b60616a81b0bbc1012f678b783df7c2e07f72161 /poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py | |
parent | a515de07dfa9eda7a303af296666e2572e581df7 (diff) | |
download | openbmc-honister.tar.xz |
subtree updateshonister
meta-openembedded: 9a0caf5b09..0e6c34f82c:
Martin Jansa (1):
ostree: prevent ostree-native depending on target virtual/kernel to provide kernel-module-overlay
Nicolas Dechesne (1):
imlib2: update SRC_URI
poky: eff78b3802..fd00d74f47:
Alexandre Belloni (1):
pseudo: Fix handling of absolute links
Anuj Mittal (2):
poky.conf: bump version for 3.4.4 release
documentation: update for 3.4.4 release
Bruce Ashfield (10):
linux-yocto/5.10: update to v5.10.109
lttng-modules: update to 2.13.1
lttng-modules: support kernel 5.18+
linux-yocto/5.10: features/security: Move x86_64 configs to separate file
linux-yocto/5.10: update to v5.10.110
linux-yocto/5.10: base: enable kernel crypto userspace API
linux-yocto/5.10: update to v5.10.112
linux-yocto: enable powerpc debug fragment
linux-yocto/5.10: update to v5.10.113
yocto-bsps: update to v5.10.113
Chen Qi (1):
cases/buildepoxy.py: fix typo
Davide Gardenal (1):
rootfs-postcommands: fix symlinks where link and output path are equal
Dmitry Baryshkov (2):
linux-firmware: correct license for ar3k firmware
linux-firmware: upgrade 20220411 -> 20220509
Felix Moessbauer (1):
wic/plugins/rootfs: Fix permissions when splitting rootfs folders across partitions
Joe Slater (1):
unzip: fix CVE-2021-4217
Khem Raj (2):
busybox: Use base_bindir instead of hardcoding /bin path
linux-yocto: Enable powerpc-debug fragment for ppc64 LE
Konrad Weihmann (1):
gmp: add missing COPYINGv3
Martin Jansa (1):
license_image.bbclass: close package.manifest file
Max Krummenacher (2):
perf: sort-pmuevents: don't drop elements
perf: sort-pmuevents: allow for additional type qualifiers and storage class
Michael Opdenacker (1):
adding missing space in appends
Ovidiu Panait (1):
openssl: upgrade 1.1.1l -> 1.1.1n
Paul Gortmaker (1):
install/devshell: Introduce git intercept script due to fakeroot issues
Peter Kjellerstedt (1):
u-boot: Inherit pkgconfig
Portia (1):
volatile-binds: Change DefaultDependencies from false to no
Rahul Kumar (1):
neard: Switch SRC_URI to git repo
Ralph Siemsen (1):
xz: fix CVE-2022-1271
Ranjitsinh Rathod (1):
openssl: Minor security upgrade 1.1.1n to 1.1.1o
Richard Purdie (14):
scripts/runqemu: Fix memory limits for qemux86-64
vim: Upgrade 8.2.4524 -> 8.2.4681
uninative: Upgrade to 3.6 with gcc 12 support
tiff: Add marker for CVE-2022-1056 being fixed
externalsrc/devtool: Fix to work with fixed export funcition flags handling
libxshmfence: Correct LICENSE to HPND
alsa-tools: Ensure we install correctly
shadow-native: Simplify and fix syslog disable patch
build-appliance-image: Update to honister head revision
base: Avoid circular references to our own scripts
base: Drop git intercept
scripts: Make git intercept global
scripts/git: Ensure we don't have circular references
vim: Upgrade 8.2.4681 -> 8.2.4912
Ross Burton (4):
bitbake: knotty: display active tasks when printing keepAlive() message
bitbake: knotty: reduce keep-alive timeout from 5000s (83 minutes) to 10 minutes
bitbake.conf: mark all directories as safe for git to read
oeqa/selftest: add test for git working correctly inside pseudo
wangmy (3):
linux-firmware: upgrade 20220310 -> 20220411
lttng-modules: upgrade 2.13.1 -> 2.13.2
lttng-modules: upgrade 2.13.2 -> 2.13.3
zhengruoqin (1):
wireless-regdb: upgrade 2022.02.18 -> 2022.04.08
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0298ba1d7a4f4f77e0ebe24f18b3f8bdc326097b
Diffstat (limited to 'poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py')
-rwxr-xr-x | poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py b/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py index 5ddf0f144f..09ba3328a7 100755 --- a/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py +++ b/poky/meta/recipes-kernel/perf/perf/sort-pmuevents.py @@ -33,10 +33,10 @@ if os.path.exists(outfile): with open(infile, 'r') as file: data = file.read() -preamble_regex = re.compile( '^(.*?)^struct', re.MULTILINE | re.DOTALL ) +preamble_regex = re.compile( '^(.*?)^(struct|const struct|static struct|static const struct)', re.MULTILINE | re.DOTALL ) preamble = re.search( preamble_regex, data ) -struct_block_regex = re.compile( '^struct.*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL ) +struct_block_regex = re.compile( '^(struct|const struct|static struct|static const struct).*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL ) field_regex = re.compile( '{.*?},', re.MULTILINE | re.DOTALL ) cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL ) name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL ) @@ -45,22 +45,25 @@ name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL ) # types and then their fields. entry_dict = {} for struct in re.findall( struct_block_regex, data ): - # print( "struct: %s %s" % (struct[0],struct[1]) ) - entry_dict[struct[1]] = {} - entry_dict[struct[1]]['type'] = struct[0] - entry_dict[struct[1]]['fields'] = {} - for entry in re.findall( field_regex, struct[2] ): + # print( "struct: %s %s %s" % (struct[0],struct[1],struct[2]) ) + entry_dict[struct[2]] = {} + entry_dict[struct[2]]['type_prefix'] = struct[0] + entry_dict[struct[2]]['type'] = struct[1] + entry_dict[struct[2]]['fields'] = {} + for entry in re.findall( field_regex, struct[3] ): #print( " entry: %s" % entry ) cpuid = re.search( cpuid_regex, entry ) if cpuid: #print( " cpuid found: %s" % cpuid.group(1) ) - entry_dict[struct[1]]['fields'][cpuid.group(1)] = entry - + entry_dict[struct[2]]['fields'][cpuid.group(1)] = entry + name = re.search( name_regex, entry ) if name: #print( " name found: %s" % name.group(1) ) - entry_dict[struct[1]]['fields'][name.group(1)] = entry - + entry_dict[struct[2]]['fields'][name.group(1)] = entry + + if not entry_dict[struct[2]]['fields']: + entry_dict[struct[2]]['fields']['0'] = entry # created ordered dictionaries from the captured values. These are ordered by # a sorted() iteration of the keys. We don't care about the order we read @@ -72,6 +75,7 @@ for struct in re.findall( struct_block_regex, data ): entry_dict_sorted = OrderedDict() for i in sorted(entry_dict.keys()): entry_dict_sorted[i] = {} + entry_dict_sorted[i]['type_prefix'] = entry_dict[i]['type_prefix'] entry_dict_sorted[i]['type'] = entry_dict[i]['type'] entry_dict_sorted[i]['fields'] = {} for f in sorted(entry_dict[i]['fields'].keys()): @@ -83,7 +87,7 @@ outf = open( outfile, 'w' ) print( preamble.group(1) ) outf.write( preamble.group(1) ) for d in entry_dict_sorted: - outf.write( "struct %s %s[] = {\n" % (entry_dict_sorted[d]['type'],d) ) + outf.write( "%s %s %s[] = {\n" % (entry_dict_sorted[d]['type_prefix'], entry_dict_sorted[d]['type'],d) ) for f in entry_dict_sorted[d]['fields']: outf.write( entry_dict_sorted[d]['fields'][f] + '\n' ) |