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

Integration Candidate: 2020-11-03 #639

Merged
merged 7 commits into from
Nov 4, 2020
Merged

Integration Candidate: 2020-11-03 #639

merged 7 commits into from
Nov 4, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Nov 3, 2020

Describe the contribution

Fix #327 and Fix #333, Squash LGTM warnings
Fix #623, add debug messages for mutex double locks
Fix #628, Update UtAssert macros with dynamic string formatting

Testing performed
See framework-bundle CI: https://github.com/nasa/cFS/pull/154/checks

Expected behavior changes

PR #634 - When OS_DEBUG is enabled, this adds a message if mutex give/take actions occur outside the expected sequence. This informs the user (via the debug console) if a lock is taken more than once or if a lock is given by a different task than the one that originally took it:

OS_MutSemTake():216:WARNING: Task 65547 taking mutex 327685 while owned by task 65547

PR #633 - No behavior changes

  • Removes all FIXME comments
  • Resolves security/filename race issue by opening file and acting on descriptor by adding fstat stub
  • Squashed the minor recommended bugs

PR #629 - UtAssert macros now accept variable string arguments.The UtAssert_True wrapper around call is no longer needed to accommodate dynamic string output, thus removing the double assert. UtAssert macros will now be able to offer more information by themselves.

System(s) tested on
Ubuntu CI

Additional context
nasa/cFS#154

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@agibson
@skliper

skliper and others added 6 commits October 22, 2020 17:44
if OS_DEBUG is enabled, this adds a message if mutex give/take
actions occur outside the expected sequence.  In particular,
this warns if a task takes a mutex more than once.
Fix #623, add debug messages for mutex double locks
Fix #628, Update UtAssert macros with dynamic string formatting
@astrogeco astrogeco changed the title Integration candidate Integration Candidate: 2020-11-03 Nov 3, 2020
@astrogeco astrogeco marked this pull request as ready for review November 3, 2020 20:00
Small edit to REVISION version comment in osapi-version.h
@astrogeco astrogeco merged commit 1a82657 into main Nov 4, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Nov 4, 2020
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Deletes now unused CFE_ES_CountObjectCallback
and CFE_ES_ListResourcesDebug.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants