Integration Candidate 2020-10-07 #936
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
Do not use EventCount to track whether an "unregistered" event was generated, because that by definition came from a different app than the one that "owns" that field. This just adds a separate field to track that state, so it doesn't potentially modify the counter for an unrelated app.
Instead of identifying a memory pool by its memory address, use a resource ID. IDs are a constant size, regardless of whether the host machine is 32 or 64 bits. - IDs can be put into commands/telemetry and maintain a more consistent format with consistent alignment requirements. - IDs can be independently verified without dereferencing memory. Previously the only way to validate a memory pool was to read the address pointed to, which results in a SEGV if the address was bad.
Move the AppID lookup to be early in the CFE_SB_SendMsgFull implementation. Avoids double locking between SB+ES and avoids a block-scope local variable.
Fix #897, EVS unregistered AppID
Fix #923, Perform appid lookup early
|
@jphickey it looks like #917 broke the build. Thankfully (maybe?) its doxygen stuff. |
Corrects doxygen links to symbols which have been updated
|
@astrogeco Fixed in commit ac402f3, doxygen looks clean now. Edit - corrected commit ID - there is a CFE and bundle commit, as usual. |
astrogeco
force-pushed
the
integration-candidate
branch
from
b31aafc
to
73479f7
Compare
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Oct 6, 2020
Combines - nasa/cFE#936 - nasa/osal#612 *** * Add osal#541 * Add cfe#898 * Add cfe#925 * Add cfe#917 * Add cFE#899 * Add nasa/cFE#888 * Add CFE hotfix for documentation link warnings * Add FastTracked nasa/osal#616 * Set submodules to main for IC-2020-10-07 Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
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
Fix #923
Fix #897
Fix #651
Fix #923
Fix #705
Fix #888
Testing performed
See Bundle: https://github.com/nasa/cFS/pull/145/checks
Expected behavior changes
PR #898 - Adds the field
UnregAppIDto track whether an "unregistered" event was generated, un-overloading theEventCountfield to serve its primary purpose of counting actual events generated from a valid/registered AppID.PR #925 - Move the AppID lookup execution to be early in the CFE_SB_SendMsgFull implementation. This avoids double locking between SB+ES and avoids a block-scope local variable.
PR #917 - Instead of identifying a memory pool by its memory address, use a resource ID. IDs are a constant size, regardless of whether the host machine is 32 or 64 bits.
PR #899 - Change from
OS_MAX*defines to appropriately-scoped CFE defines for array sizingPR #919 - This creates the new
CFE_Status_ttypedef for function's return status codes. Also adds a note toCFE_TBL_GetStatussince its behavior will likely change in the future in the hopes of not having a non-zero "info" status.System(s) tested on
Bundle CI - https://github.com/nasa/cFS/pull/145/checks
Additional context
Part of nasa/cFS#145
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@skliper
@CDKnightNASA