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

Fix #385, Deprecate interrupt related APIs #396

Merged

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Mar 26, 2020

Describe the contribution
Removes coverage test code completely. Marks OS_Int* API's as deprecated and implementations
removed if OSAL_OMIT_DEPRECATED defined
Fixes #385

Only changes under review for this request are 3618ae3, the rest of the commits were included to avoid merge conflicts (they were included in other pull requests for review)

Testing performed
Steps taken to test the contribution:

  1. Remove calls from cfe/fsw/cfe-core/src/es/cfe_es_perf.c, note this change will break until the performance ticket is resolved (which removes the OS_Int calls) - CFE_ES_PerfLogAdd needs better mutual exclusion cFE#456
  2. Built and ran test with and without OMIT_DEPRECATED defined.

Expected behavior changes
None

System(s) tested on

  • Hardware: cFS Dev 3 VM
  • OS: Ubuntu 18.04
  • Versions: bundle, these commits, and changes noted above

Additional context
Associated OS_Int tickets become wontfix - #376, #370, #71

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added enhancement CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Mar 26, 2020
@skliper skliper added this to the 5.1.0 milestone Mar 26, 2020
@skliper
Copy link
Contributor Author

skliper commented Mar 26, 2020

Note this would benefit from #362 being resolved. Also recommend testing for a vxworks and an rtems build. Also as mentioned needs nasa/cFE#456 resolved, and would benefit from the current integration candidate being merged (and rebase this on master)....

Removes coverage test code completely
Marks OS_Int* API's as deprecated and implementations
removed if OSAL_OMIT_DEPRECATED defined
@skliper
Copy link
Contributor Author

skliper commented Mar 27, 2020

Rebased on current master

@astrogeco
Copy link
Contributor

CCB 2020-04-01 - APPROVED

@astrogeco astrogeco added CCB - 20200401 CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 1, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate April 6, 2020 17:43
@astrogeco
Copy link
Contributor

astrogeco commented Apr 6, 2020

@skliper see conflict in merge dialog, I assume I should keep the #ifndef

<<<<<<< fix385-deprecate-os-int
#endif /* OSAL_OMIT_DEPRECATED */

=======
#ifndef OSAL_OMIT_DEPRECATED
>>>>>>> integration-candidate

@skliper
Copy link
Contributor Author

skliper commented Apr 6, 2020

Hard to tell without context, want me to rebase by branch on integration-candidate?

@astrogeco
Copy link
Contributor

Hard to tell without context, want me to rebase by branch on integration-candidate?

It should show you the context if you click resolve conflicts. Up to you though.

@skliper
Copy link
Contributor Author

skliper commented Apr 6, 2020

Either include them both or delete them both. Basically one commit deprecates all the interrupt APIs, the next deprecates all the shared memory. They can either be all in the same big ifndef block or two separate.

@astrogeco astrogeco merged commit 12499d6 into nasa:integration-candidate Apr 6, 2020
@skliper skliper deleted the fix385-deprecate-os-int branch February 1, 2021 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deprecate OS_Int* related APIs
2 participants