walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fixed #9965: handle template function names properly in stack trace o… (#3125)

This commit is contained in:
Oliver Stöneberg 2021-02-11 08:04:26 +01:00 committed by GitHub
parent e8f36f6148
commit d008356c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/donate-cpu-server.py
View File

@ -24,7 +24,7 @@ import html as html_lib
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
# changes) # changes)
SERVER_VERSION = "1.3.13" SERVER_VERSION = "1.3.14"
OLD_VERSION = '2.3' OLD_VERSION = '2.3'
@ -199,12 +199,12 @@ def crashReport(results_path: str) -> str:
if not l.strip(): if not l.strip():
break break
# #0 0x00007ffff71cbf67 in raise () from /lib64/libc.so.6 # #0 0x00007ffff71cbf67 in raise () from /lib64/libc.so.6
m = re.search(r'(?P<number>#\d+) .* (?P<function>.+)\(.*\) from (?P<binary>.*)$', l) m = re.search(r'(?P<number>#\d+) .* in (?P<function>.+)\(.*\) from (?P<binary>.*)$', l)
if m: if m:
stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) from ' + m.group('binary')) stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) from ' + m.group('binary'))
continue continue
# #11 0x00000000006f2414 in valueFlowNumber (tokenlist=tokenlist@entry=0x7fffffffc610) at build/valueflow.cpp:2503 # #11 0x00000000006f2414 in valueFlowNumber (tokenlist=tokenlist@entry=0x7fffffffc610) at build/valueflow.cpp:2503
m = re.search(r'(?P<number>#\d+) .* (?P<function>.+)\(.*\) at (?P<location>.*)$', l) m = re.search(r'(?P<number>#\d+) .* in (?P<function>.+)\(.*\) at (?P<location>.*)$', l)
if m: if m:
stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) at ' + m.group('location')) stack_trace.append(m.group('number') + ' ' + m.group('function') + '(...) at ' + m.group('location'))
continue continue
@ -637,7 +637,7 @@ def timeReport(resultPath: str, show_gt: bool) -> str:
html = '<html><head><title>{}</title></head><body>\n'.format(title) html = '<html><head><title>{}</title></head><body>\n'.format(title)
html += '<h1>{}</h1>\n'.format(title) html += '<h1>{}</h1>\n'.format(title)
html += '<pre>\n' html += '<pre>\n'
column_width = [40, 10, 10, 10, 10] column_width = [40, 10, 10, 10, 10, 10]
html += '<b>' html += '<b>'
html += fmt('Package', 'Date Time', OLD_VERSION, 'Head', 'Factor', link=False, column_width=column_width) html += fmt('Package', 'Date Time', OLD_VERSION, 'Head', 'Factor', link=False, column_width=column_width)
html += '</b>\n' html += '</b>\n'
@ -710,6 +710,7 @@ def timeReport(resultPath: str, show_gt: bool) -> str:
total_time_factor = 0.0 total_time_factor = 0.0
html += 'Time for all packages (not just the ones listed above):\n' html += 'Time for all packages (not just the ones listed above):\n'
html += fmt('Total time:', html += fmt('Total time:',
'',
'{:.1f}'.format(total_time_base), '{:.1f}'.format(total_time_base),
'{:.1f}'.format(total_time_head), '{:.1f}'.format(total_time_head),
'{:.2f}'.format(total_time_factor), link=False, column_width=column_width) '{:.2f}'.format(total_time_factor), link=False, column_width=column_width)