Github/littlefs
1
Fork 0
Code Actions Activity

Changed./scripts/struct.py to organize by header file

Browse Source 
Avoids redundant counting of structs shared in multiple .c files, which
is very common. This is different from the other scripts,
code.py/data.py/stack.py, but this difference makes sense as struct
declarations have a very different lifetime.
This commit is contained in:
Christopher Haster
2022-03-18 13:38:17 -05:00
parent 316b019f41
commit fe8f3d4f18
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/structs.py
+8 -10
View File
@@ -44,9 +44,7 @@ def collect(paths, **args):
# find file numbers # find file numbers
m = decl_pattern.match(line) m = decl_pattern.match(line)
if m: if m:
decls[int(m.group('no'))] = ( decls[int(m.group('no'))] = m.group('file')
m.group('file'),
int(m.group('dir')))
proc.wait() proc.wait()
if proc.returncode != 0: if proc.returncode != 0:
if not args.get('verbose'): if not args.get('verbose'):
@@ -77,8 +75,8 @@ def collect(paths, **args):
if (name is not None if (name is not None
and decl is not None and decl is not None
and size is not None): and size is not None):
decl_file, decl_dir = decls.get(decl, ('', 0)) decl = decls.get(decl, '?')
results[(path, name)] = (size, decl_file, decl_dir) results[(decl, name)] = size
found = (m.group('tag') == 'structure_type') found = (m.group('tag') == 'structure_type')
name = None name = None
decl = None decl = None
@@ -97,21 +95,21 @@ def collect(paths, **args):
sys.exit(-1) sys.exit(-1)
flat_results = [] flat_results = []
for (path, struct), (size, decl_file, decl_dir) in results.items(): for (file, struct), size in results.items():
# map to source files # map to source files
if args.get('build_dir'): if args.get('build_dir'):
path = re.sub('%s/*' % re.escape(args['build_dir']), '', path) file = re.sub('%s/*' % re.escape(args['build_dir']), '', file)
# only include structs declared in header files in the current # only include structs declared in header files in the current
# directory, ignore internal-only # structs (these are represented # directory, ignore internal-only # structs (these are represented
# in other measurements) # in other measurements)
if not args.get('everything'): if not args.get('everything'):
if not (decl_file.endswith('.h') and decl_dir == 0): if not file.endswith('.h'):
continue continue
# replace .o with .c, different scripts report .o/.c, we need to # replace .o with .c, different scripts report .o/.c, we need to
# choose one if we want to deduplicate csv files # choose one if we want to deduplicate csv files
path = re.sub('\.o$', '.c', path) file = re.sub('\.o$', '.c', file)
flat_results.append((path, struct, size)) flat_results.append((file, struct, size))
return flat_results return flat_results