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-04-22 #649

Merged
merged 16 commits into from
May 1, 2020
Merged

Integration Candidate: 2020-04-22 #649

merged 16 commits into from
May 1, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 28, 2020

Describe the contribution

Fix #591, #121, #410, #503, #623

Testing performed
See PRs
Bundle CI - https://github.com/nasa/cFS/pull/74/checks?check_run_id=637311464

Expected behavior changes

PR #625 - Upon power on reset, default system log mode set to overwrite. Upon processor reset, default system log mode set to discard.

PR #619 - No longer locks while locked (no issue observed on linux/posix, but user reported issue on FreeRTOS 10)

PR #606 - Internal CFE_TBL_LoadFromFile() API changed slightly to add AppName as a parameter. Return value from LoadFromFile() no longer relevant for event generation.

PR #622 - Updates CFE_TBL_CleanUpApp such that it now checks the 'used flag' prior to calling CFE_TBL_RemoveAccessLink for a given TblHandle. Also sets the AppId to CFE_TBL_NOT_OWNED after removing the access descriptor link from linked list.

PR #624 - Removed OS_FS_SUCCESS, OS_FS_ERROR , OS_FS_ERR_INVALID_POINTER, OS_FS_ERR_NO_FREE_FDS , OS_FS_ERR_INVALID_FD, and OS_FS_UNIMPLEMENTED from osapi-os-filesys.h

System(s) tested on
See PRs
Bundle CI - Ubuntu:Bionic

Additional context
nasa/cFS#74

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hafgeman, NASA-GSFC
Daniel Knutsen, NASA-GSFC
Christopher D. Knight NASA-ARC
Gerardo E. Cruz-Ortiz, NASA-GSFC

skliper and others added 9 commits April 15, 2020 16:37
Now uses CFE_ES_SysLogWrite_Unsync inside shared data lock
Fix #410, separate SYSLOG configurable defaults for power on and proc…
Fix #591, Avoid deadlock in CFE_ES_CreatObjects
Fix #503, better events for CFE_TBL_Load()
Fix #121, Add check for UsedFlag and sets APID to CFE_TBL_NOT_OWNED
@jphickey
Copy link
Contributor

Note - PR #654 also needs to be added to this IC, after the hotfix gets another hotfix.

@skliper
Copy link
Contributor

skliper commented May 1, 2020

There was a breakdown in process for #606, TODO's that needed to be resolved got into the integration candidate. There's also something in this change that is breaking the usersguide document generation. @astrogeco @CDKnightNASA

@astrogeco astrogeco marked this pull request as ready for review May 1, 2020 21:06
@astrogeco astrogeco merged commit 20c25c2 into master May 1, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE_ES_CreateObjects calls CFE_ES_WriteToSysLog while holding shared data lock
5 participants