osal Integration candidate: 2021-05-25 #1050
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resolves two related issues: - OS_TaskGetId does not return a valid value for tasks where cancellation is pending, but they are still running. This in turn is likely to trigger other (bogus) debug checks which invoke OS_DEBUG and in turn do console writes. - The console write itself is a cancellation point, which is now done while holding a BSP mutex. If canceled here, then the mutex is not released. Solution is in two parts: - OS_TaskGetId should return the task ID it knows about, regardless of whether the task is pending cancellation or not. - Defer cancellation of the task while the BSP is locked, ensure it reaches the unlock, then restore the previous cancel state.
Fix #1027, defer cancellation when BSP locked
Fix #991, Add count sem timeout test
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 24, 2021
Combines: - nasa/cFE#1568 - nasa/osal#1050 Includes: - nasa/cFE#1524, add printf format casts - nasa/cFE#1520, accept "NULL" as entry point - nasa/cfe #1549, add capability to generate multiple tables - nasa/osal#1026, Add count sem timeout test
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 26, 2021
Combines: - cfe v6.8.0-rc1+dev593 (nasa/cFE#1568) - osal v5.1.0-rc1+dev458 (nasa/osal#1050) Includes: - nasa/cFE#1524, add printf format casts - nasa/cFE#1520, accept "NULL" as entry point - nasa/cfe #1549, add capability to generate multiple tables - nasa/cFE#1551, fixes discrepancies (return type, parameter names, etc) between function protoypes and implementation. Updates stubs accordingly - nasa/osal#1026, Add count sem timeout test - nasa/osal#1026, defer cancellation when BSP locked
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#1049, replace OS_fsBlocksFree
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Part of nasa/cFS#260
Tests
osal Checks https://github.com/nasa/osal/pull/1050/checks
cFS Bubdle Checks https://github.com/nasa/cfs/pull/260/checks
Description
PR #1026
Fix #991, Add count sem timeout test
PR #1028
Fix #1027, defer cancellation when BSP locked
Removes chance of deadlock by ensuring
OS_TaskGetIdreturns the task ID it knows about, regardless of whether the task is pending cancellation or not. Defers cancellation of the task while the BSP is locked, ensure it reaches the unlock, then restores the previous cancel state.Fixes a bogus debug message about unlocking from the wrong task if the task is pending delete.
Authors
@jphickey
@zanzaben