Skip to content

Fix #424, Add looping wait for self exiting task#426

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
skliper:fix424-self-exit-task-delay
Apr 28, 2020
Merged

Fix #424, Add looping wait for self exiting task#426
astrogeco merged 1 commit intonasa:integration-candidatefrom
skliper:fix424-self-exit-task-delay

Conversation

@skliper
Copy link
Contributor

@skliper skliper commented Apr 20, 2020

Describe the contribution
Loops the parent OS_TaskDelay until child task exits before testing OS_TaskDelete. Avoids the test depending on system loading/performance with single delay approach.
Fix #424

Testing performed
Steps taken to test the contribution:

  1. Standard build, ran osal-core-test -d and observed Loop count of 1 (I've never experienced the failure, which if avoided would have a loop count > 1)

Expected behavior changes
Consistent osal-core-test execution status

System(s) tested on

  • Hardware: cFS Dev Server 3
  • OS: Ubuntu 18.04
  • Versions: Bundle + this commit

Additional context
Issue seen on dev server 4 and Mac OS

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 20, 2020
@skliper skliper added this to the 5.1.0 milestone Apr 20, 2020
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 to me

@skliper
Copy link
Contributor Author

skliper commented Apr 20, 2020

@stanislaw @yammajamma - could you test on your systems that reported failure? If you run with debug osal-core-test -d | grep osa-core-test.c:134, should see a loop count greater than 1 eventually, and if it passes shows the update fixed the issue.

@skliper
Copy link
Contributor Author

skliper commented Apr 20, 2020

Or pipe to a file so you can see the exit status... whatever.

@astrogeco
Copy link
Contributor

CCB 20200422 - Add upper limit to loop, APPROVED

@skliper skliper added CCB - 20200422 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 22, 2020
@skliper skliper force-pushed the fix424-self-exit-task-delay branch from 5a09605 to e7bba8f Compare April 22, 2020 19:23
@skliper
Copy link
Contributor Author

skliper commented Apr 22, 2020

Added loop limit of 100, and assert

@skliper
Copy link
Contributor Author

skliper commented Apr 22, 2020

Tested with bundle, SIMULATION=native ENABLE_UNIT_TEST=true. Passed

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.

@astrogeco astrogeco changed the base branch from master to integration-candidate April 27, 2020 23:00
@astrogeco astrogeco merged commit 3707b78 into nasa:integration-candidate Apr 28, 2020
@skliper skliper deleted the fix424-self-exit-task-delay branch February 1, 2021 21:36
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.

Test #7: osal-core-test Failure

3 participants