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

Integration Candidate: 2020-04-15 #635

Merged
merged 24 commits into from
Apr 27, 2020
Merged

Integration Candidate: 2020-04-15 #635

merged 24 commits into from
Apr 27, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 21, 2020

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

  1. PR CMake: minor changes to improve the CLion IDE CMake experience #474 - Changes to cmake syntax might improve behavior in IDEs
  2. PR Fix #617, Updates comments to note that the length limit of OS_MAX_PATH_LEN and OS_MAX_API_NAME includes null terminator #575 - Documentation Only
  3. PR Fix #344, Remove mission/platform include dirs #577 - None, reduces user confusion due to duplicate defines
  4. PR Fix #580, Deprecate CFE_OS_ abstracted error codes #582 - None, deprecates additional items
  5. PR Fix #335: Shell unsigned pkt length bug #584 - None, except if someone defines this value as unsigned it won't break...
  6. PR Fix #295 and #480, Resolve app table scanning race conditions #598 - No impact to CMD/TLM interface or API. Internal changes only.
  7. PR Fix #263, expose IsValidMsgID and partially address #245 Consistent use of MsgId types #602 - Exposes the CFE_SB_IsValidMsgId() for application usage.
  8. PR Fix #494, Updates CFE_SB_GetLastSenderID to check if message has been sent on pipe #605 - CFE_SB_GetLastSenderID will now detect if it is being called prior to a message being sent on a given pipe.
  9. PR Fix #632, Infer OSAL_SYSTEM_BSPTYPE from CFE_SYSTEM_PSP_NAME #634 - Mismatches between PSP/BSP/OS are now detected and warned about during make prep. Only the 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

stanislaw and others added 17 commits February 20, 2020 23:15
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.
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 #494, Updates CFE_SB_GetLastSenderID to check if message has been sent on pipe
dmknutsen and others added 6 commits April 22, 2020 16:20
Manually merged to resolve conflicts.

From branch jphickey/fix-263-msgid-api:

Fix #245, Consistent use of MsgId type
Fix #263, Expose CFE_SB_IsValidMsgId() API

From branch dmknutsen/issue_240:

Fixes #240, removes MESSAGE_FORMAT_IS_CCSDS ifdefs from code
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 skliper linked an issue Apr 27, 2020 that may be closed by this pull request
Copy link
Contributor

@skliper skliper left a 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

@astrogeco astrogeco marked this pull request as ready for review April 27, 2020 19:38
@astrogeco astrogeco linked an issue Apr 27, 2020 that may be closed by this pull request
@astrogeco astrogeco linked an issue Apr 27, 2020 that may be closed by this pull request
@astrogeco astrogeco merged commit 3c616f2 into master Apr 27, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants