scripts: Adopted explicit underscore in Result._prefix

For consistency with the --prefix flag.

I confused myself while debugging some script behavior, and that's
no good.
This commit is contained in:
Christopher Haster
2026-01-22 23:18:25 -06:00
parent 98279a0b36
commit 078a1fb4c6
9 changed files with 34 additions and 34 deletions
+4 -4
View File
@@ -148,7 +148,7 @@ class CsvInt(co.namedtuple('CsvInt', 'a')):
class CodeResult(co.namedtuple('CodeResult', [
'file', 'function',
'size'])):
_prefix = 'code'
_prefix = 'code_'
_by = ['file', 'function']
_fields = ['size']
_sort = ['size']
@@ -918,7 +918,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -996,7 +996,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1242,7 +1242,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % CodeResult._prefix))
"to %r." % CodeResult._prefix)
parser.add_argument(
'-!', '--everything',
action='store_true',
+4 -4
View File
@@ -255,7 +255,7 @@ class CsvFrac(co.namedtuple('CsvFrac', 'a,b')):
class CovResult(co.namedtuple('CovResult', [
'file', 'function', 'line',
'calls', 'hits', 'funcs', 'lines', 'branches'])):
_prefix = 'cov'
_prefix = 'cov_'
_by = ['file', 'function', 'line']
_fields = ['calls', 'hits', 'funcs', 'lines', 'branches']
_sort = ['funcs', 'lines', 'branches', 'hits', 'calls']
@@ -781,7 +781,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -859,7 +859,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1215,7 +1215,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % CovResult._prefix))
"to %r." % CovResult._prefix)
parser.add_argument(
'-F', '--source',
dest='sources',
+2 -2
View File
@@ -2200,7 +2200,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -2278,7 +2278,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
+4 -4
View File
@@ -145,7 +145,7 @@ class CtxResult(co.namedtuple('CtxResult', [
'z', 'i', 'file', 'function',
'off', 'size',
'children', 'notes'])):
_prefix = 'ctx'
_prefix = 'ctx_'
_by = ['z', 'i', 'file', 'function']
_fields = ['off', 'size']
_sort = ['size']
@@ -1180,7 +1180,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1258,7 +1258,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1563,7 +1563,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % CtxResult._prefix))
"to %r." % CtxResult._prefix)
parser.add_argument(
'-i', '--internal',
action='store_true',
+4 -4
View File
@@ -148,7 +148,7 @@ class CsvInt(co.namedtuple('CsvInt', 'a')):
class DataResult(co.namedtuple('DataResult', [
'file', 'function',
'size'])):
_prefix = 'data'
_prefix = 'data_'
_by = ['file', 'function']
_fields = ['size']
_sort = ['size']
@@ -918,7 +918,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -996,7 +996,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1242,7 +1242,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % DataResult._prefix))
"to %r." % DataResult._prefix)
parser.add_argument(
'-!', '--everything',
action='store_true',
+4 -4
View File
@@ -159,7 +159,7 @@ class PerfResult(co.namedtuple('PerfResult', [
'z', 'file', 'function', 'line',
'cycles', 'bmisses', 'branches', 'cmisses', 'caches',
'children'])):
_prefix = 'perf'
_prefix = 'perf_'
_by = ['z', 'file', 'function', 'line']
_fields = ['cycles', 'bmisses', 'branches', 'cmisses', 'caches']
_sort = ['cycles', 'bmisses', 'cmisses', 'branches', 'caches']
@@ -1279,7 +1279,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1357,7 +1357,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1812,7 +1812,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % PerfResult._prefix))
"to %r." % PerfResult._prefix)
parser.add_argument(
'-F', '--source',
dest='sources',
+4 -4
View File
@@ -150,7 +150,7 @@ class PerfBdResult(co.namedtuple('PerfBdResult', [
'z', 'file', 'function', 'line',
'readed', 'proged', 'erased',
'children'])):
_prefix = 'perfbd'
_prefix = 'perfbd_'
_by = ['z', 'file', 'function', 'line']
_fields = ['readed', 'proged', 'erased']
_sort = ['erased', 'proged', 'readed']
@@ -1253,7 +1253,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1331,7 +1331,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1813,7 +1813,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % PerfBdResult._prefix))
"to %r." % PerfBdResult._prefix)
parser.add_argument(
'-F', '--source',
dest='sources',
+4 -4
View File
@@ -145,7 +145,7 @@ class StackResult(co.namedtuple('StackResult', [
'z', 'file', 'function',
'frame', 'limit',
'children', 'notes'])):
_prefix = 'stack'
_prefix = 'stack_'
_by = ['z', 'file', 'function']
_fields = ['frame', 'limit']
_sort = ['limit', 'frame']
@@ -921,7 +921,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -999,7 +999,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1306,7 +1306,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % StackResult._prefix))
"to %r." % StackResult._prefix)
parser.add_argument(
'-!', '--everything',
action='store_true',
+4 -4
View File
@@ -145,7 +145,7 @@ class StructResult(co.namedtuple('StructResult', [
'z', 'i', 'file', 'struct',
'off', 'size', 'align',
'children'])):
_prefix = 'struct'
_prefix = 'struct_'
_by = ['z', 'i', 'file', 'struct']
_fields = ['off', 'size', 'align']
_sort = ['size', 'align']
@@ -1069,7 +1069,7 @@ def read_csv(path, Result, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1147,7 +1147,7 @@ def write_csv(path, Result, results, *,
# prefix? this only applies to field fields
if prefix is None:
if hasattr(Result, '_prefix'):
prefix = '%s_' % Result._prefix
prefix = Result._prefix
else:
prefix = ''
@@ -1452,7 +1452,7 @@ if __name__ == "__main__":
parser.add_argument(
'--prefix',
help="Prefix to use for fields in CSV/JSON output. Defaults "
"to %r." % ("%s_" % StructResult._prefix))
"to %r." % StructResult._prefix)
parser.add_argument(
'-i', '--internal',
action='store_true',