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 #281, cleanup memory range table #283

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
A number of cleanup items related to the PSP memory range API

  • Make the table itself an internal object - should only be accessed via the PSP API.
  • Update to use size_t instead of uint32
  • Update the Linux/RTEMS implementation to use full range (SIZE_MAX).

Fixes #281

Testing performed
Build and sanity check CFE
Issue the mem pool stats TLM command on Linux, confirm that the CFE_PSP_MemValidateRange() call now succeeds

Expected behavior changes
The mem pool stats TLM command now works on 64-bit Linux, and sends out the expected telemetry packet.

System(s) tested on
Ubuntu 20.04
VxWorks 6.9 on MCP750
RTEMS 4.11.3 on QEMU

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@jphickey jphickey added CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Mar 29, 2021
@jphickey jphickey marked this pull request as draft March 29, 2021 18:13
@jphickey jphickey force-pushed the fix-281-memrange-cleanup branch from 42f0914 to 94f104b Compare March 29, 2021 18:28
A number of cleanup items related to the PSP memory range API

- Make the table itself an internal object - should only be accessed
via the PSP API.
- Update to use size_t instead of uint32
- Update the Linux/RTEMS implementation to use full range (SIZE_MAX).
@jphickey jphickey marked this pull request as ready for review March 29, 2021 18:39
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 29, 2021
@jphickey jphickey force-pushed the fix-281-memrange-cleanup branch from 94f104b to 4db4fbe Compare March 29, 2021 18:40
@skliper skliper added this to the 1.6.0 milestone Mar 30, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate April 2, 2021 21:24
@astrogeco astrogeco added dependency IC:2021-04-02 conflicts and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 2, 2021
@astrogeco astrogeco force-pushed the integration-candidate branch from 282ae92 to 511392c Compare April 2, 2021 21:27
@jphickey jphickey merged commit 54083e1 into nasa:integration-candidate Apr 2, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 2, 2021
nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 2, 2021
*Submodule ICs:*
nasa/cFE#1279, nasa/PSP#288

*Submodule IC Contents:*

nasa/cFE#1274 - Fix #1273, remove PspConfig global object
nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe

nasa/PSP#287 - Fix #280, remove psp configdata global object
nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 2, 2021
*Submodule ICs:*
nasa/cFE#1279, nasa/PSP#288

*Contents:*

nasa/cFE#1274 - Fix #1273, remove PspConfig global object
nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe

nasa/PSP#287 - Fix #280, remove psp configdata global object
nasa/PSP#283 - Fix #281, cleanup memory range table
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 2, 2021
*Submodule ICs:*
nasa/cFE#1279, nasa/PSP#288

*Contents:*

nasa/cFE#1274 - Fix #1273, remove PspConfig global object
nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe

nasa/PSP#287 - Fix #280, remove psp configdata global object
nasa/PSP#283 - Fix #281, cleanup memory range table
@jphickey jphickey deleted the fix-281-memrange-cleanup branch April 29, 2021 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_PSP_MemValidateRange() always fails on 64-bit targets
3 participants