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

Fix #10509 (improved signal detection daca@home client) / also optimized stack trace generation (#3157)

This commit is contained in:
Oliver Stöneberg 2021-10-11 19:07:19 +02:00 committed by GitHub
parent 474c3d3731
commit 85b02e4ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/donate_cpu_lib.py
View File

@ -15,7 +15,7 @@ import shlex
# 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)
CLIENT_VERSION = "1.3.13" CLIENT_VERSION = "1.3.14"
# Timeout for analysis with Cppcheck in seconds # Timeout for analysis with Cppcheck in seconds
CPPCHECK_TIMEOUT = 30 * 60 CPPCHECK_TIMEOUT = 30 * 60
@ -333,12 +333,19 @@ def scan_package(work_path, cppcheck_path, jobs, libraries):
timing_str = ''.join(timing_info_list) timing_str = ''.join(timing_info_list)
# detect errors # detect errors
sig_file = None
sig_num = -1 sig_num = -1
sig_msg = 'Internal error: Child process crashed with signal ' for ie_line in internal_error_messages_list:
sig_pos = stderr.find(sig_msg) # temp/dlib-19.10/dlib/test/dnn.cpp:0:0: error: Internal error: Child process crashed with signal 11 [cppcheckError]
if sig_pos != -1: if 'Child process crashed with signal' in ie_line:
sig_start_pos = sig_pos + len(sig_msg) sig_file = ie_line.split(':')[0]
sig_num = int(stderr[sig_start_pos:stderr.find(' ', sig_start_pos)]) sig_msg = 'signal '
sig_pos = stderr.find(sig_msg)
if sig_pos != -1:
sig_start_pos = sig_pos + len(sig_msg)
sig_num = int(ie_line[sig_start_pos:ie_line.find(' ', sig_start_pos)])
# break on the first signalled file for now
break
print('cppcheck finished with ' + str(returncode) + ('' if sig_num == -1 else ' (signal ' + str(sig_num) + ')')) print('cppcheck finished with ' + str(returncode) + ('' if sig_num == -1 else ' (signal ' + str(sig_num) + ')'))
if returncode == RETURN_CODE_TIMEOUT: if returncode == RETURN_CODE_TIMEOUT:
@ -346,12 +353,21 @@ def scan_package(work_path, cppcheck_path, jobs, libraries):
return returncode, ''.join(internal_error_messages_list), '', elapsed_time, options, '' return returncode, ''.join(internal_error_messages_list), '', elapsed_time, options, ''
# generate stack trace for SIGSEGV, SIGABRT, SIGILL, SIGFPE, SIGBUS # generate stack trace for SIGSEGV, SIGABRT, SIGILL, SIGFPE, SIGBUS
if returncode in (-11, -6, -4, -8, -7) or sig_num in (11, 6, 4, 8, 7): has_error = returncode in (-11, -6, -4, -8, -7)
has_sig = sig_num in (11, 6, 4, 8, 7)
if has_error or has_sig:
print('Crash!') print('Crash!')
# make sure we have the actual error code set
if has_sig:
returncode = -sig_num
stacktrace = '' stacktrace = ''
if cppcheck_path == 'cppcheck': if cppcheck_path == 'cppcheck':
# re-run within gdb to get a stacktrace # re-run within gdb to get a stacktrace
cmd = 'gdb --batch --eval-command=run --eval-command="bt 50" --return-child-result --args ' + cppcheck_cmd + " -j1 " + dir_to_scan cmd = 'gdb --batch --eval-command=run --eval-command="bt 50" --return-child-result --args ' + cppcheck_cmd + " -j1 "
if sig_file is not None:
cmd += sig_file
else:
cmd += dir_to_scan
_, st_stdout, _, _ = run_command(cmd) _, st_stdout, _, _ = run_command(cmd)
gdb_pos = st_stdout.find(" received signal") gdb_pos = st_stdout.find(" received signal")
if not gdb_pos == -1: if not gdb_pos == -1:
@ -360,9 +376,12 @@ def scan_package(work_path, cppcheck_path, jobs, libraries):
stacktrace = st_stdout[gdb_pos:] stacktrace = st_stdout[gdb_pos:]
else: else:
stacktrace = st_stdout[last_check_pos:] stacktrace = st_stdout[last_check_pos:]
# if no stacktrace was generated return the original stdout # if no stacktrace was generated return the original stdout or internal errors list
if not stacktrace: if not stacktrace:
stacktrace = stdout if has_sig:
stacktrace = ''.join(internal_error_messages_list)
else:
stacktrace = stdout
return returncode, stacktrace, '', returncode, options, '' return returncode, stacktrace, '', returncode, options, ''
if returncode != 0: if returncode != 0: