Fix #965, remove OSAL ID from App/LibInfo struct #1017
Merged
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
jphickey
added
the
CCB:Ready
The "osal_id_t" type isn't defined in any of the CFE message/interface header files for use within telemetry. This ID is an ephemeral runtime value and is not relevant to a ground system or anything outside CFE, so it makes most sense to simply remove this ID from the telemtry structure. Note that all commands are name-based, not ID-based, hence why this ID is not really useful.
|
CCB 2020-11-18 APPROVED
|
jphickey
force-pushed
the
fix-965-osal-ids-tlm
branch
from
2463878 to
720525e
Compare
|
Commit 720525e is the corrected version (it actually just changes a little bit less than the original with the hope of reducing merge conflicts) |
astrogeco
added
IC-20201124
and removed
CCB:Ready
|
@jphickey can you clear the conflicts here? |
|
@astrogeco - conflict resolved in the IC branch. |
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
Removes the Module ID from the App/Lib info telemetry structures.
Fixes #965
Testing performed
Build and sanity test CFE
Run all unit tests
Expected behavior changes
App and Lib info telemetry structures no longer contain the "ModuleId" value from OSAL.
System(s) tested on
Ubuntu 20.04
Additional context
CFE code should be distinct about the types used in messages vs. the types used at runtime. They may need to be different depending on mission architecture (i.e. mixing 32 and 64 bits, different local platform-specific sizes of things, etc). All message definitions should be in the proper app-specific message typedef files and must have mission scope, not platform scope.
The "osal_id_t" type isn't defined in any of the CFE message/interface header files for use within telemetry, but this was included in the AppInfo and LibInfo telemetry structures.
This ID is an ephemeral runtime value and is not relevant to a ground system or anything outside CFE, so it makes most sense to simply remove this ID from the telemetry structure. Note that all commands are name-based, not ID-based, hence why this ID is not really useful.
The alternative would be to use CFE_ES_ResourceID_t type instead. This is the same underlying value but defined in ES rather than OSAL, in the typedefs file with all other message types.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.