Integration Candidate: 2020-09-09 #876
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
…work as expected
Use the OSAL-supplied typedef `osal_id_t` to store OSAL IDs, along with OSAL-supplied conversion/cast routines when interfacing this value with other modules.
Apply the appid/taskid pattern to Generic Counter resources. No real logic change - just putting the repeated logic into inline functions.
CFE_ES_LIB_ALREADY_LOADED and CFE_ES_ERR_SYS_LOG_TRUNCATED
Fix #846, Deconflict CFE_ES_LIB_ALREADY_LOADED and CFE_ES_ERR_SYS_LOG_TRUNCATED
Fix #863, Add debug message from SendEvents
Fix #870, generic counter table management
Fix #858, use osal id typedef
fix #862 - unsub of a message ID that is already unsubbed
Fix #873, Add test for SB subscribe/unusubscribe/unsubscribe
Fix #769, Adds name to struct/union/enum typedefs
yammajamma
added a commit
to nasa/cFS
that referenced
this pull request
Sep 15, 2020
Integration Candidate: 2020-09-09 Integration candidate includes: nasa/cFE#876 nasa/osal#596 nasa/cFS-GroundSystem#135
# for free
to join this conversation on GitHub.
Already have an account?
# 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 #846
Fix #858
Fix #862
Fix #863
Fix #870
Fix #873
Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/139/checks
Expected behavior changes
PR #872 - Deconflict
CFE_ES_LIB_ALREADY_LOADEDandCFE_ES_ERR_SYS_LOG_TRUNCATEDEIDsPR #868 - Scrub all CFE references/uses of OSAL IDs to use the proper
osal_id_ttype. Any place that an OSAL ID is stored in memory or passed in an API call are changed to theosal_id_ttype, rather thanuint32. Conversions between this and other types (e.g. bare integer) is done using the OSAL-supplied conversion helpers.PR #865 - After the changes implemented in #101, there may be routing table entries with no subscribers (RoutePtr->ListHeadPtr would be NULL.) This could cause a seg-fault. Also, even if there are entries in the routing table, there will be no event generated if the unsubscribe does not find a matching route entry.
PR #864 - Adds debug message.
PR #871 - Applies the appid/taskid pattern to Generic Counter resources.
PR #875 - Adds test for SB subscribe/unusubscribe/unsubscribe.
System(s) tested on
Ubuntu - CI
Additional context
nasa/cFS#139
Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
Joseph Hickey, Vantage Systems, Inc.
Chris Knight, NASA-ARC