Skip to content

donate-cpu-server.py: fixed "top x" reports / some cleanups #5475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 3 commits into from
Sep 22, 2023
Merged

donate-cpu-server.py: fixed "top x" reports / some cleanups #5475

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37dae27
donate-cpu-server.py: bumped version
firewave Sep 22, 2023
266e3ae
donate-cpu-server.py: fixed overwritten variable in `check_library_re…
firewave Sep 22, 2023
172c5e4
donate-cpu-server.py: cleaned up some loops
firewave Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions tools/donate-cpu-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# 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
# changes)
SERVER_VERSION = "1.3.45"
SERVER_VERSION = "1.3.46"

OLD_VERSION = '2.12.0'

Expand Down Expand Up @@ -665,10 +665,9 @@ def messageIdReport(resultPath: str, marker: str, messageId: str, query_params:
if line.startswith('ftp://'):
url = line
continue
if line.startswith(marker):
inResults = True
continue
if not inResults:
if line.startswith(marker):
inResults = True
continue
if line.startswith('diff:'):
break
Expand Down Expand Up @@ -710,10 +709,9 @@ def messageIdTodayReport(resultPath: str, messageId: str, marker: str) -> str:
if line.startswith('ftp://'):
url = line
continue
if line.startswith(marker):
inResults = True
continue
if not inResults:
if line.startswith(marker):
inResults = True
continue
if line.startswith('diff:'):
break
Expand Down Expand Up @@ -919,22 +917,22 @@ def check_library_report(result_path: str, message_id: str) -> str:
metric = 'macros'
m_column = 'macro'
metric_link = 'unknown_macro'
marker = HEAD_MARKER
start_marker = HEAD_MARKER
elif message_id == 'valueFlowBailoutIncompleteVar':
metric = 'variables'
m_column = 'Variable'
metric_link = 'incomplete_var'
marker = HEAD_MARKER
start_marker = HEAD_MARKER
elif message_id == 'checkLibraryCheckType':
metric = 'types'
m_column = 'Type'
metric_link = 'check_library'
marker = INFO_MARKER
start_marker = INFO_MARKER
else:
metric = 'functions'
m_column = 'Function'
metric_link = 'check_library'
marker = INFO_MARKER
start_marker = INFO_MARKER

functions_shown_max = 5000
html = '<!DOCTYPE html>\n'
Expand All @@ -960,10 +958,9 @@ def check_library_report(result_path: str, message_id: str) -> str:
else:
# Current package, parse on
continue
if line.startswith(marker):
in_results = True
continue
if not in_results:
if line.startswith(start_marker):
in_results = True
continue
if line.startswith('diff:'):
break
Expand Down Expand Up @@ -1033,13 +1030,12 @@ def check_library_function_name(result_path: str, function_name: str, query_para
if line.startswith('cppcheck-options:'):
cppcheck_options = line
continue
if line.startswith(marker):
in_results = True
if not in_results:
if line.startswith(marker):
in_results = True
continue
if line.startswith('diff:'):
break
if not in_results:
continue
if id not in line:
continue
if not (' ' + function_name + ' ') in line:
Expand Down