Skip to content

Fix #111, do not assume a specific core name#207

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-111-core-moduleid
Oct 20, 2020
Merged

Fix #111, do not assume a specific core name#207
astrogeco merged 1 commit intonasa:integration-candidatefrom
jphickey:fix-111-core-moduleid

Conversation

@jphickey
Copy link
Contributor

@jphickey jphickey commented Oct 14, 2020

Describe the contribution
Improve the module ID lookup when getting the CFE core text segment info.

  • Ideally get the ID directly from what was loaded by startCfeCore
  • As a fallback use the actual CFE core name from the configdata

Do not use a hardcoded name.

Fixes #111

Testing performed
Build and run unit tests

Expected behavior changes
VxWorks PSP should use the real module name, not assume cfe-core.o when getting text segment info

System(s) tested on
Ubuntu 20.04

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

@jphickey
Fix nasa#111, do not assume a specific core name
8e84345 
Improve the module ID lookup when getting the CFE core text segment info.

- Ideally get the ID directly from what was loaded by startCfeCore
- As a fallback use the actual CFE core name from the configdata

Do not use a hardcoded name.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 14, 2020
@skliper
Copy link
Contributor

skliper commented Oct 14, 2020 •
edited by astrogeco
Loading

CCB: 2020-10-14: Approved (pending test). Requesting ticket to add a functional test (not implemented is OK on platforms that don't support it).

@astrogeco astrogeco added CCB-20201014 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Oct 15, 2020
@astrogeco astrogeco changed the base branch from main to integration-candidate October 15, 2020 19:02
@astrogeco astrogeco changed the base branch from integration-candidate to main October 15, 2020 19:03
@astrogeco
Copy link
Contributor

astrogeco commented Oct 19, 2020

@jphickey and @skliper did you all open the related ticket? Can you let me know when this is ready to merge?

@skliper skliper mentioned this pull request Oct 19, 2020
Open
@skliper
Copy link
Contributor

skliper commented Oct 19, 2020

New issue opened at #208 to add a functional test. From the CCB I recall @jphickey mentioned this change still needed to be tested on the hardware. Not sure if that was completed yet.

@jphickey
Copy link
Contributor Author

jphickey commented Oct 20, 2020

Yes - I was able to run this on the MCP750 and confirm that I'm getting a valid result from CFE_PSP_GetCFETextSegmentInfo() and subsequently CFE is calculating a checksum as expected.

@astrogeco this should be OK to merge.

@jphickey
Copy link
Contributor Author

jphickey commented Oct 20, 2020

Note - the part I am not able to test is the one where GetCfeCoreModuleID is provided - because this requires rebuilding the kernel. That can be tested at a later date. In the meantime using the default filename seems to work fine as long as you don't rename the file from what CMake actually built.

@astrogeco astrogeco changed the base branch from main to integration-candidate October 20, 2020 15:41
@astrogeco astrogeco merged commit 2260bd8 into nasa:integration-candidate Oct 20, 2020
@astrogeco astrogeco mentioned this pull request Oct 20, 2020
Merged
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 20, 2020
@astrogeco
Add nasa/PSP#207
08ff87b
@skliper
Copy link
Contributor

skliper commented Oct 20, 2020

Note - the part I am not able to test is the one where GetCfeCoreModuleID is provided - because this requires rebuilding the kernel. That can be tested at a later date. In the meantime using the default filename seems to work fine as long as you don't rename the file from what CMake actually built.

Copy, fine by me.

astrogeco added a commit to nasa/cFS that referenced this pull request Oct 21, 2020
@astrogeco @jphickey
Integration Candidate: 2020-10-20 (#152)
3a76845 
* Add nasa/PSP#207

* Add nasa/cFE#946

* Update CFE to fix startup issue

* Add nasa/osal#626

Co-authored-by: Joseph Hickey <[email protected]>
@jphickey jphickey deleted the fix-111-core-moduleid branch January 6, 2021 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

dependency

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

mcp750-vxworks PSP hardcodes core as "cfe-core.o"

3 participants

@jphickey @skliper @astrogeco