Fix #1088, avoid task delete during UtPrintf #1093
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
In the osal_core_UT test, the test task was being deleted while it was in the midst of a UtPrintf call, which left the BSP mutex in a locked state, causing deadlock. Using SEM_DELETE_SAFE attribute avoids task deletion for the mutex holder, and adding a small delay to the test case makes all the messages appear as expected (accounts for slow serial console on test platform).
jphickey
added
the
CCB:Ready
skliper
approved these changes
Jun 28, 2021
zanzaben
approved these changes
Jun 28, 2021
pepepr08
approved these changes
Jun 28, 2021
|
CCB:2021-06-30 APPROVED |
astrogeco
added
CCB:Approved
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Jul 2, 2021
**Combines:** nasa/osal#1098 **Includes:** nasa/osal#1081, add range to OS_TaskDelay checks nasa/osal#1085, root task ID on RTEMS nasa/osal#1090, increase timeout in network-api-test nasa/osal#1091, avoid task delete during UtPrintf nasa/osal#1093, increase UT symbol dump size limit nasa/osal#1097, do not register RTOS timer for external sync nasa/osal#1092, Add osal# prefix to Network API group
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Jul 7, 2021
**Combines:** nasa/osal#1098 **Includes:** nasa/osal#1081, add range to OS_TaskDelay checks nasa/osal#1085, return OS_OBJECT_ID_UNDEFINED for root task ID on RTEMS nasa/osal#1090, increase UT symbol dump size limit nasa/osal#1091, do not register RTOS timer for external sync nasa/osal#1093, avoid task delete during UtPrintf nasa/osal#1097, Add osal prefix to Network API group nasa/osal#1092, increase timeout in network-api-test
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Jul 7, 2021
**Combines** nasa/cFE#1654, cfe v6.8.0-rc1+dev739 nasa/osal#1098, osal v5.1.0-rc1+dev564 **Includes** nasa/cFE#1444, Change index type to resolve infinite loop warning nasa/cFE#1653, Adding coverage for cfe_es_task.c nasa/cFE#1638, Expand FS Header Functional tests. nasa/cFE#1637, Complete coverage for cfe_es_start.c and cfe_es_syslog.c nasa/osal#1081, add range to OS_TaskDelay checks nasa/osal#1085, return OS_OBJECT_ID_UNDEFINED for root task ID on RTEMS nasa/osal#1090, increase UT symbol dump size limit nasa/osal#1091, do not register RTOS timer for external sync nasa/osal#1093, avoid task delete during UtPrintf nasa/osal#1097, Add osal prefix to Network API group nasa/osal#1092, increase timeout in network-api-test Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com> Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com> Co-authored-by: Himanshu <himanshu007-creator@users.noreply.github.com>
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.
Describe the contribution
In the osal_core_UT test, the test task was being deleted while it was in the midst of a UtPrintf call, which left the BSP mutex in a locked state, causing deadlock.
Using SEM_DELETE_SAFE attribute avoids task deletion for the mutex holder, and adding a small delay to the test case makes all the messages appear as expected (accounts for slow serial console on test platform).
Fixes #1088
Testing performed
Run osal_core_UT
Expected behavior changes
Test now passes, does not deadlock
System(s) tested on
MCP750 / VxWorks 6.9
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.