coverage: C++ fix loop in gcov_coverage_dump #31029
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
area: Test Framework
pabigot
requested changes
Dec 28, 2020
subsys/testsuite/coverage/coverage.c
Outdated
| @@ -23,7 +23,7 @@ | |||
| K_HEAP_DEFINE(gcov_heap, MALLOC_MAX_HEAP_SIZE); | |||
|
|
|||
|
|
|||
| static struct gcov_info *gcov_info_head; | |||
| static struct gcov_info *gcov_info_head = NULL; | |||
There was a problem hiding this comment.
This is not necessary: the pointer will be default initialized to zero by the C runtime startup.
subsys/testsuite/coverage/coverage.c
Outdated
| @@ -247,6 +248,10 @@ void gcov_coverage_dump(void) | |||
|
|
|||
| k_heap_free(&gcov_heap, buffer); | |||
| gcov_list = gcov_list->next; | |||
| if(gcov_list_first == gcov_list) | |||
There was a problem hiding this comment.
Please fix style issues (spacing and brace placement):
if (gcov_list_first == gcov_list) {
goto coverage_dump_end;
}
pabigot
approved these changes
Dec 28, 2020
Great ! Thanks I will fix it 👍 |
During coverage reports generation in C++ code gcov_coverage_dump() function would get stuck in endless loop. Fix by checking list head pointer with current list pointer. Signed-off-by: Marko Poljanić <[email protected]>
nashif
approved these changes
Jan 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
During coverage reports generation in C++ code gcov_coverage_dump()
function would get stuck in endless loop. Fix by checking list head
pointer with current list pointer.
Signed-off-by: Marko Poljanic [email protected]
Environment:
Host: macOS 11.1
Cross toolchain: gcc-arm-none-eabi-9-2020-q2-update
Steps to test the fix:
Test will run in qemu and dump gcov data to log.log file after that it is possible to generate .html coverage report.
cd $ZEPHYR_BASE/tests/application_development/gen_inc_filewest build -b mps2_an385 -- -DCONFIG_COVERAGE=y -DCONFIG_COVERAGE_GCOV=y -DCONFIG_COVERAGE_DUMP=yninja -Cbuild run | tee log.logpython3 $ZEPHYR_BASE/scripts/gen_gcov_files.py -i log.logcp src/main.cpp build/CMakeFiles/app.dir/srccd build/CMakeFiles/app.dirgcovr -r . --html -o coverage.html --html-details --gcov-executable <gcov_path_in_SDK>Related to:
#20729