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

Fix #110, Apply message alignment pattern #112

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Nov 30, 2020

Describe the contribution
Fix #110

  • Replace CFE_SB_RcvMsg with CFE_SB_ReceiveBuffer
  • Use CFE_SB_Buffer_t for receiving and casting to command types
  • Use CFE_MSG_CommandHeader_t and CFE_MSG_TelemetryHeader_t in
    command and telemetry type definitions
  • Use CFE_SB_TransmitMsg to copy the command and telemetry
    into a CFE_SB_Buffer_t and send it where needed
  • Avoids need to create send buffers within the app (or union
    the packet types with CFE_SB_Buffer_t)
  • Eliminates references to CFE_SB_CmdHdr_t and CFE_SB_TlmHdr_t
    that formerly enforced alignment since these had potential
    to change the actual packet sizes
  • No need to cast to CFE_MSG_Message_t anywhere since it's
    available in the CFE_SB_Buffer_t union
  • Replaced CFE_MSG_Size_t with size_t

Testing performed
Bundle CI, unit tests, spot checked cmd/tlm

Expected behavior changes
None, pattern applied only

System(s) tested on

Additional context
Depends on nasa/cFE#1015

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added enhancement New feature or request CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Nov 30, 2020
sample_app Integration Candidate: 2020-11-24
@astrogeco
Copy link
Contributor

CCB 2020-12-02 APPROVED

- Replace CFE_SB_RcvMsg with CFE_SB_ReceiveBuffer
- Use CFE_SB_Buffer_t for receiving and casting to command types
- Use CFE_MSG_CommandHeader_t and CFE_MSG_TelemetryHeader_t in
  command and telemetry type definitions
- Use CFE_SB_TransmitMsg to copy the command and telemetry
  into a CFE_SB_Buffer_t and send it where needed
- Avoids need to create send buffers within the app (or union
  the packet types with CFE_SB_Buffer_t)
- Eliminates references to CFE_SB_CmdHdr_t and CFE_SB_TlmHdr_t
  that formerly enforced alignment since these had potential
  to change the actual packet sizes
- No need to cast to CFE_MSG_Message_t anywhere since it's
  available in the CFE_SB_Buffer_t union
- Replaced CFE_MSG_Size_t with size_t
@skliper
Copy link
Contributor Author

skliper commented Dec 3, 2020

@astrogeco rebased and resolved.

@skliper skliper removed the conflict This PR has merge conflicts label Dec 3, 2020
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Dec 7, 2020
@astrogeco astrogeco changed the base branch from main to integration-candidate December 8, 2020 16:55
@astrogeco astrogeco merged commit efebf7e into nasa:integration-candidate Dec 8, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 8, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 9, 2020
@skliper skliper deleted the fix110-alignment-pattern branch February 1, 2021 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependency enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update for suggested alignment enforcement pattern (nasa/cFE#1009)
2 participants