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 #932, Eliminate time and access name collisions with VxWorks #950

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Apr 7, 2021

Describe the contribution
Fix #932 - changed parameter names to avoid collisions

Testing performed
Build/run unit tests, passed

Expected behavior changes
None

System(s) tested on

  • Hardware: Local docker container
  • OS: Ubuntu 18.04
  • Versions: cFS Bundle main + this commit

Additional context
None

Third party code
None

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

@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 7, 2021
@skliper skliper added this to the 6.0.0 milestone Apr 7, 2021
@skliper skliper force-pushed the fix932-identifer-collisions branch from daacd50 to 3962c15 Compare April 7, 2021 15:22
@skliper skliper added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 14, 2021
@skliper
Copy link
Contributor Author

skliper commented Apr 14, 2021

CCB 2021-04-14 - APPROVED

@skliper skliper added CCB:2021-04-07 and removed CCB:Approved Indicates code review and approval by community CCB labels Apr 14, 2021
@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB IC:2021-04-27 and removed CCB:2021-04-07 labels Apr 21, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate April 21, 2021 13:15
@astrogeco astrogeco merged commit d0ebfb4 into nasa:integration-candidate Apr 21, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
nasa/osal#950 Eliminate time and access name collisions with VxWorks
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 22, 2021
Combines:

nasa/cFE#1406
nasa/osal#967
nasa/cFS-GroundSystem#178

Includes:

nasa/cFE#1290, Split interface and implementation modules
nasa/cFE#1376, add docs to CFE_ES_RegisterCDS() regarding clearing
nasa/cFE#1292, Remove testrunner and convert testcase to app
cfe-IC:2021-04-20, HOTFIX: Always build cfe_assert.

nasa/osal#950, Eliminate time and access name collisions with VxWorks
nasa/osal#946, Fix Shell implementation on posix and rtems

nasa/cFS-GroundSystem#174, update executable name and version in setup.py
nasa/cFS-GroundSystem#175, Add executable install guide
@skliper skliper deleted the fix932-identifer-collisions branch October 22, 2021 19:37
jphickey added a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Because the process of handling a control request involves
calling other subsystems, the ES lock needs to be released.
However, this also means that the app record can change state
for other reasons, such as the app self-exiting at the same
time.

To avoid this possibility, process in two phases:

First assemble a list of tasks that have timed out
and need to be cleaned up, while ES is locked.

Next actually perform the cleanup, while ES is unlocked.
In areas during cleanup that need to update the ES global,
the lock is locally re-acquired and released.
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Non-distinct identifiers
2 participants