Skip to content
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.

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

cFE Integration candidate: 2020-12-22 #1047

Merged
merged 9 commits into from
Dec 18, 2020
Merged

cFE Integration candidate: 2020-12-22 #1047

merged 9 commits into from
Dec 18, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Dec 16, 2020

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.h from ES UT.

PR #1035 - Use volatile sig_atomic_t for system state to avoid race issue if uint32 isn't atomic on a system

PR #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_PrintMsg with UT_DisplayPkt. Also removed unused Test_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

skliper and others added 6 commits December 3, 2020 15:22
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 1034, Atomic type for SystemState
@astrogeco astrogeco changed the title cFE Integration candidate: 2020-12-15 cFE Integration candidate: 2020-12-22 Dec 18, 2020
@astrogeco astrogeco marked this pull request as ready for review December 18, 2020 15:25
@astrogeco astrogeco merged commit 56397a3 into main Dec 18, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 18, 2020
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants