cFE Integration candidate: 2020-12-22 #1047
Merged
+115
−138
Conversation
This file contains 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
Set the newly-added flags parameter on the OS_ModuleLoad properly to allow an app to be properly unloaded, which in turn allows the reload command to work as expected.
This is the only reference to OSAL header other than the standard osapi.h and common_types.h.
Fix #1042, remove use of osapi-os-loader.h
Fix 1034, Atomic type for SystemState
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.
Describe the contribution
Combines IC 2020-12-15 and 2020-12-22
Fix #1042, remove use of osapi-os-loader.h
Fix #1034, Atomic type for SystemState
Fix #952, OSAL module flags to permit app reload
Fix #1030, change test_MSG to UT_DisplayPkt
Testing performed
See https://github.com/nasa/cFS/pull/162/checks
Expected behavior changes
PR #1043 - Remove use of
osapi-os-loader.hfrom ES UT.PR #1035 - Use volatile
sig_atomic_tfor system state to avoid race issue if uint32 isn't atomic on a systemPR #1038 - Set the flags parameter on the OS_ModuleLoad() properly to allow an app to be properly unloaded, which in turn allows the reload command to work as expected. Fixes problem where unload comand resulted in continuous restarting of the same app code.
PR #1046 - Replaced
Test_MSG_PrintMsgwithUT_DisplayPkt. Also removed unusedTest_MSG_Sum.System(s) tested on
Ubuntu 18.04
Additional context
Part of nasa/cFS#162
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
@skliper
@jphickey
@zanzaben