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 #1279, rtems queue multi-size, mimic posix logic #1283

Merged
merged 2 commits into from
Oct 11, 2022

Conversation

thesamprice
Copy link

Checklist (Please check before submitting)

Describe the contribution
Refactor rtems queue to not do size check, and to mimic posix logic.

Fixes #1279

Testing performed
Steps taken to test the contribution:

  1. Build steps '...'
  2. Execution steps '...'

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

  • Hardware: [e.g. PC, SP0, MCP750]
  • OS: [e.g. Ubuntu 18.04, RTEMS 4.11, VxWorks 6.9]
  • Versions: [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps or tools]

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.

@thesamprice
Copy link
Author

The posix diff vs rtems diff
This is a more aggressive change than just deleting the size check.

image

@thesamprice thesamprice force-pushed the 1279-rtems-queue-multisize-2 branch from a3ddd01 to 76a6cc2 Compare August 31, 2022 03:12
@skliper
Copy link
Contributor

skliper commented Aug 31, 2022

Looks great! Probably should use OSAL_SIZE_C to explicitly convert to size_t, I think that would avoid implicit conversion warnings if/when we ever do that analysis. Looks like you'll need to run clang-format-10 (or fix formatting by hand) to squash the format workflow error.

@thesamprice thesamprice force-pushed the 1279-rtems-queue-multisize-2 branch from 19d29e8 to b708d5d Compare September 22, 2022 17:49
@chillfig
Copy link
Contributor

@thesamprice, would you please take a look at the unit test failure before merging?

@thesamprice
Copy link
Author

@jphickey You recently added fix-1252-condvar-api. Is there anything in this merge that would be causing that test to fail?

@thesamprice
Copy link
Author

@chillfig Not sure why the last update fixed the unit test failure, but i guess adding OSAL_SIZE_C casting fixed it?

@dzbaker dzbaker added the CCB:Approved Indicates code review and approval by community CCB label Oct 6, 2022
dzbaker added a commit to nasa/cFS that referenced this pull request Oct 11, 2022
*Combines:*

cfe v7.0.0-rc4+dev193
cFS-GroundSystem v3.0.0-rc4+dev33
osal v7.0.0-rc4+dev131
to_lab v2.5.0-rc4+dev31
ci_lab v2.5.0-rc4+dev39
sample_app v1.3.0-rc4+dev35
sample_lib v1.3.0-rc4+dev28
tblCRCTool v1.3.0-rc4+dev24
elf2cfetbl v3.4.0-rc4+dev26
sch_lab v2.5.0-rc4+dev41

**Includes:**

*cFS*
- #567
- #514

*cFE*
- nasa/cFE#2163
- nasa/cFE#2158
- nasa/cFE#2159

*osal*
- nasa/osal#1283
- nasa/osal#1291
- nasa/osal#1298

*sample_app*
- nasa/sample_app#185
- nasa/sample_app#183

*sch_lab*
- nasa/sch_lab#123

*tblCRCTool*
- nasa/tblCRCTool#73

*to_lab*
- nasa/to_lab#127
- nasa/to_lab#126
- nasa/to_lab#129

*ci_lab*
- nasa/ci_lab#123
- nasa/ci_lab#120

*sample_lib*
- nasa/sample_lib#89
- nasa/sample_lib#86

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#224
- nasa/cFS-GroundSystem#225

*elf2cfetbl*
- nasa/elf2cfetbl#117

Co-authored-by: Avi Weiss <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Ariel Adams <[email protected]>
Co-authored by: Sam Price <[email protected]>
@dzbaker dzbaker mentioned this pull request Oct 11, 2022
2 tasks
@dzbaker dzbaker merged commit 310b9f6 into nasa:main Oct 11, 2022
dzbaker added a commit to nasa/cFS that referenced this pull request Oct 11, 2022
*Combines:*

cfe v7.0.0-rc4+dev193
cFS-GroundSystem v3.0.0-rc4+dev33
osal v7.0.0-rc4+dev131
to_lab v2.5.0-rc4+dev31
ci_lab v2.5.0-rc4+dev39
sample_app v1.3.0-rc4+dev35
sample_lib v1.3.0-rc4+dev28
tblCRCTool v1.3.0-rc4+dev24
elf2cfetbl v3.4.0-rc4+dev26
sch_lab v2.5.0-rc4+dev41

**Includes:**

*cFS*
- #567
- #514

*cFE*
- nasa/cFE#2163
- nasa/cFE#2158
- nasa/cFE#2159

*osal*
- nasa/osal#1283
- nasa/osal#1291
- nasa/osal#1298

*sample_app*
- nasa/sample_app#185
- nasa/sample_app#183

*sch_lab*
- nasa/sch_lab#123

*tblCRCTool*
- nasa/tblCRCTool#73

*to_lab*
- nasa/to_lab#127
- nasa/to_lab#126
- nasa/to_lab#129

*ci_lab*
- nasa/ci_lab#123
- nasa/ci_lab#120

*sample_lib*
- nasa/sample_lib#89
- nasa/sample_lib#86

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#224
- nasa/cFS-GroundSystem#225

*elf2cfetbl*
- nasa/elf2cfetbl#117

Co-authored-by: Avi Weiss <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Ariel Adams <[email protected]>
Co-authored by: Sam Price <[email protected]>
@dmknutsen dmknutsen added this to the Draco milestone Jan 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB draco-rc4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RTEMS osal queue mixed sizes
5 participants