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 20191030 #388

Merged
merged 5 commits into from
Nov 7, 2019
Merged

Integration Candidate 20191030 #388

merged 5 commits into from
Nov 7, 2019

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Oct 31, 2019

Describe the contribution
Fixes #361, fixes #373, fixes #374, fixes #381

Testing performed
Steps taken to test the contribution:

  1. Checked out bundle with OSAL and cFE ic-20191030 branches
  2. make ENABLE_UNIT_TESTS=TRUE SIMULATION=native prep
  3. make
  4. make install
  5. make test
    Built without warnings, all tests passed except osal_timer_UT (nominal result on linux)
    executed cfe, successful startup with no warnings

Expected behavior changes
Resolved potential lockup bug
Resolved anomalous messages produced during app delete

System(s) tested on:

  • cFS dev server
  • OS: Ubuntu 16.04
  • Versions: bundle with OSAL and cFE ic-20191030 branches

Additional context
None

Contributor Info
Jacob Hageman - NASA/GSFC

jphickey and others added 5 commits October 31, 2019 15:54
The mutex for the log file write during the WriteLogFileCmd
excution was held longer than it should have been.

This lock must *NOT* be held during EVS_SendEvent, as this
will cause deadlock.

This moves the mutex to protect only the area that actually
accesses the log data, and it moves all send event calls
to be AFTER the mutex is released.
Fix 2 areas where the CFE_ES_GetTaskInfo() function could
have been passed an App ID rather than a task ID, which
would create an incorrect result.
Fixes #361, #373, #374, #381
Code reviewed and approved at 20191023 and 30 CCBs
@skliper skliper requested a review from jphickey October 31, 2019 21:04
@skliper
Copy link
Contributor Author

skliper commented Nov 7, 2019

CCB 20191106 - approved for merge to master

@skliper skliper merged commit e9f7382 into master Nov 7, 2019
@skliper skliper deleted the ic-20191030 branch November 7, 2019 21:34
@skliper skliper added this to the 6.8.0 milestone Dec 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants