-
Notifications
You must be signed in to change notification settings - Fork 206
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
Integration Candidate: 2020-04-15 #635
Merged
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
This is needed when CFE's root CMakeLists.txt is not the highest level CMakeLists.txt in the project.
…ATH_LEN and OS_MAX_API_NAME includes null terminator
Added CFE_OMIT_DEPRECATED_6_7 just to be consistent Also fix #552 - removes non-existent codes
Create a new background job to handle the maintenance tasks that had been performed in the ES main task as part of the CFE_ES_ScanAppTable() routine. All app state changes, including those invoked by messages, are now handled by this job. This also slightly changes the semantics of CFE_ES_RunLoop and CFE_ES_ExitApp. Now, the CFE_ES_RunLoop routine no longer requires a RunStatus buffer. Instead, the only thing that matters is the RunStatus value that is eventually passed to CFE_ES_ExitApp after the shutdown is complete. This should be mostly backward compatible, as the recommended app pattern would pass the same value to both functions. This commit also fixes #480, as the value passed to CFE_ES_ExitApp will not override a request that was already pending.
…en sent on pipe
This also more properly defines the the CFE_SB_INVALID_MSG_ID macro for external use going forward.
Make CFE core apps consistent in their use of the CFE_SB_MsgId type and with the CFE SB API. This employs the CFE SB API whenever any of the following needs to happen: - Use of a CFE_SB_MsgId_t value within a printf (event, syslog, etc). - Initialization of a CFE_SB_MsgId_t from an integer value - Comparison of two CFE_SB_MsgId_t values - Checking if a CFE_SB_MsgId_t value is within the valid set A few new macros are introduced, mainly because the inline functions that already existed for this purpose cannot be used where evaluation must be done at compile time (e.g. constants, struct initialization). These are initially just typecasts, but could become more interesting in future revisions.
Normally the CFE PSP uses/links with an OSAL BSP of the same name. This removes the need to explicitly specify OSAL_SYSTEM_BSPTYPE in the toolchain file, as it can be reliably inferred.
Fix #617, Updates comments to note that the length limit of OS_MAX_PATH_LEN and OS_MAX_API_NAME includes null terminator
CMake: minor changes to improve the CLion IDE CMake experience
Fix #295, Resolve app table scanning race conditions
Fix #580, Deprecate CFE_OS_ abstracted error codes
Fix #344, Remove mission/platform include dirs
Fix #335: Shell unsigned pkt length bug
Fix #494, Updates CFE_SB_GetLastSenderID to check if message has been sent on pipe
Fix #632, Infer OSAL_SYSTEM_BSPTYPE from CFE_SYSTEM_PSP_NAME
The set_directory_properties() function overwrites existing properties. Normally the properties were empty but the global_build_options.cmake might make it non-empty (e.g. OMIT_DEPRECATED). Using set_property() signature instead has an option to APPEND rather than overwrite.
The CFE_SB_HIGHEST_VALID_MSGID symbol is deprecated.
skliper
approved these changes
Apr 27, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving the 2 hotfixes
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
Fixes #617, #344, #580, #335, #295, #480, #263, #494, and #632
Testing performed
See PRs
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/162280689
Expected behavior changes
CFE_SB_IsValidMsgId()
for application usage.CFE_SB_GetLastSenderID
will now detect if it is being called prior to a message being sent on a given pipe.CFE_SYSTEM_PSPNAME
is actually required to be specified for a CFE build now. Others can be omitted.System(s) tested on
See PRs
Bundle CI - Ubuntu:Bionic
Additional context
Part of nasa/cFS#70
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems Inc.
Jacob Hageman, NASA-GSFC
Daniel Knutsen, NASA-GSFC
Stanislav Pankevich, PTS GmbH