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 #393, find psp standard module #402

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

avan989
Copy link
Contributor

@avan989 avan989 commented Aug 11, 2023

Update to find psp module from standard list as well as global list

Checklist (Please check before submitting)

Describe the contribution
A clear and concise description of what the contribution is.
Fixes #393. Since Linux Symon is part of the standard module, CFE_PSP_Module_FindByName and CFE_PSP_Module_GetAPIEntry also need to search the standard module list. This fix let these function iterate through CFE_PSP_BASE_MODULE_LIST as well as GLOBAL_CONFIGDATA.PspModuleList.

Testing performed
Steps taken to test the contribution:

  1. Build with HS and linux sysmon as part of standard psp.

  2. See the telemetry

  3. Build with HS and Linux sysmon as part of the global psp list (add into target.cmake instead of standard psp)

  4. See telemetry

Expected behavior changes
A clear and concise description of how this contribution will change behavior and level of impact.

  • API Change: xxx (if applicable)
  • Behavior Change: xxx (if applicable)
  • Or no impact to behavior

System(s) tested on

  • VM with Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
Full name and company/organization/center of all contributors ("Personal" if individual work)

  • Note CLAs apply to only software contributions.

Anh Van. GSFC

@avan989 avan989 force-pushed the fix-393-psp-find-module-by-name branch from 3f82e7e to a98bf07 Compare August 11, 2023 14:38
@avan989 avan989 changed the title fix #393, find psp standard module Fix #393, find psp standard module Aug 11, 2023
@avan989 avan989 force-pushed the fix-393-psp-find-module-by-name branch from a98bf07 to 4e8773d Compare August 11, 2023 14:44
Fix nasa#393, update cfe_psp_module_findbyname and ...getAPIEntry to search
internal module list.
@avan989 avan989 force-pushed the fix-393-psp-find-module-by-name branch from 4e8773d to 5d93e17 Compare August 12, 2023 10:29
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for fixing this. Customer is currently running into this issue.

@dmknutsen dmknutsen added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Aug 17, 2023
@dzbaker dzbaker added CCB:Approved Indicates Approval by CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Aug 17, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Aug 18, 2023
*Combines:*

cFE v7.0.0-rc4+dev366
psp v1.6.0-rc4+dev82

**Includes:**

*cFE*
- nasa/cFE#2428

*psp*
- nasa/PSP#397
- nasa/PSP#402

Co-authored by: Daniel Knutsen <[email protected]>
Co-authored by: Anh Van <[email protected]>
@dzbaker dzbaker mentioned this pull request Aug 18, 2023
2 tasks
@dzbaker dzbaker merged commit 7f81476 into nasa:main Aug 18, 2023
11 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Aug 18, 2023
*Combines:*

cFE v7.0.0-rc4+dev366
psp v1.6.0-rc4+dev82

**Includes:**

*cFE*
- nasa/cFE#2428

*psp*
- nasa/PSP#397
- nasa/PSP#402

Co-authored by: Daniel Knutsen <[email protected]>
Co-authored by: Anh Van <[email protected]>
@dmknutsen dmknutsen added this to the Equuleus milestone Aug 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates Approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_PSP_Module_FindByName does not find base modules
4 participants