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-10-20 #959

Merged
merged 8 commits into from
Oct 21, 2020
Merged

Integration Candidate: 2020-10-20 #959

merged 8 commits into from
Oct 21, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Oct 21, 2020

Describe the contribution
Fix #943
Fix #924
Fix #502

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

Expected behavior changes
PR #946

System(s) tested on
Ubuntu

Additional context
Part of nasa/cFS#152

Third party code
None

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

jphickey and others added 6 commits October 13, 2020 17:00
Implement consistent conversion/lookup functions to translate
between names and IDs for all resource types.

Also reorganize all internal resource ID functions into a separate
source file for better organization.

Clean up documentation and references.
Use the entire resource ID space (16 bits) and do not
immediately recycle ID values until the full space is
used.

Implement a generic routine to find the next available ID,
and modify every resource ID allocation to use this
routine.

Where necessary, this also corrects for differences in
argument checking and duplicate checking between the various
resource types.  All resource allocation procedures now
have consistent argument checking, and will reject
duplicate name creation for any resources that are
also associated with names.
There is no need to store the main task name a second time in
the app record, as it is already stored in the task record.
Add a NULL check to CFE_ES_ResourceID_ToIndex_Internal().  Although
this function is internal, it does check arguments on behalf of the
public APIs which call this.
For backward compatibility - remove logic that actually made thes
different numerical values.  This should be put back in at some point.
Fix #943, #924 and #502, improve resource ID management
@astrogeco
Copy link
Contributor Author

astrogeco commented Oct 21, 2020

@jphickey we have a problem with the merge from #946,

1980-012-14:03:20.00039 EVS:Call to CFE_ES_GetAppID Failed:RC=0xC4000001
1980-012-14:03:20.00041 EVS:Application Init Failed,RC=0xC4000001

See https://travis-ci.com/github/nasa/cFS/jobs/402942495

Due to a merge the setting of this to its final value got moved.
Need to use "Pending" value, not the one in the table record.
@jphickey
Copy link
Contributor

Fixed - this was some sort of merge/rebase issue, the line that sets the ID got moved but the refs before it were using the wrong (reserved) value not the correct (pending) value.

@astrogeco astrogeco marked this pull request as ready for review October 21, 2020 21:49
@astrogeco astrogeco merged commit 3077251 into main Oct 21, 2020
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
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