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-08-19 #576

Merged
merged 6 commits into from
Aug 25, 2020
Merged

Integration Candidate: 2020-08-19 #576

merged 6 commits into from
Aug 25, 2020

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Aug 24, 2020

Describe the contribution
fix #565
fix #564
fix #557

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/130/checks

Expected behavior changes
PR #558 - Removes internal functions that are no longer used or defined but whose prototypes and stubs were still present in OS_ObjectIdMap

PR #567 - Removes repetitive clearing of the global ID and unlocking global table and replaces these with common implementation in the idmap source file. This moves deleting tables to be similar to creating tables and provides
a common location for additional table-deletion-related logic.

PR #566 - Propagates return code from OS_TaskRegister_Impl(). If this routine fails then return the error to the caller, which also prevents the task from starting.

System(s) tested on
Ubuntu - CI

Additional context
nasa/cFS#130

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

jphickey and others added 5 commits August 13, 2020 13:24
These internal functions were no longer used or defined but
the prototype and stub were still present.
If this routine fails then return the error to the caller,
which will also prevent the task from starting.
Remove repetitive clearing of the global ID and unlocking
global table and replace with common implementation in the
idmap code.  In addition to removing repeated logic, this
makes deletion more like an inverse of creation, and provides
a common/single point where additiona deletion-related
logic can be added.
Fix #557, remove OS_ObjectIdMap/Unmap prototype and stub
Fix #565, propagate return code from OS_TaskRegister_Impl()
Refactored +dev in OS_VERSION macros
@astrogeco astrogeco merged commit 9c74b1b into main Aug 25, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 25, 2020
Contains: 

nasa/cFE#833
nasa/osal#576
nasa/to_lab#58
nasa/sch_lab#52

1. Update submodules for IC-20200819

2. Update cfe to reflect HOTFIX nasa/cFE#838

3. Point submodules to main for IC-20200819

Co-authored-by: Yasir Khan <yasir.majeed@nasa.gov>
@astrogeco astrogeco added this to the 6.0.0 milestone Sep 22, 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
3 participants