-
Notifications
You must be signed in to change notification settings - Fork 215
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 #285, Refactor OSAL code selection #427
Fix #285, Refactor OSAL code selection #427
Conversation
0624edc
to
adfbec8
Compare
Force-push to rebase onto latest "master" branch rather than integration-candidate, now showing as one commit... |
88690d7
to
2f67435
Compare
Force pushed to squash all fixes so far. Tested on MCP750 and looks good there too. This is ready for CCB review. |
20200422 CCB - Covered concepts and patterns, line-by-line and official approval will be off-line. Note will require rebases and careful merge to avoid conflicts. |
Question - Just added enhancement #434 for the separate issue, which made me think rather than adding a separate config option for every debug feature, maybe we should also rename As this PR is already changing these configs, maybe it should preemptively rename this one and extend its scope to be applicable to these other debug features, or is it preferable to have more fine-grained options? |
I prefer to continue to support custom configuration of the individual options, but have no problem with a general "wrapper" switch to enable them all. |
@skliper based on your email I added the fast track label, do you want to put this in the 20200415 IC? I'll probably merge that to master by Monday April 27 |
I don't think we can do that due to cross dependencies. There were already other items in the 2020-04-22 CCB which introduced changes that need to be reconciled/merged with this change set. I recommend to follow the normal cycle, just do so as expediently as we can. |
@jphickey merged everything else, might need to work with @skliper and @dmknutsen on #423 and #421 |
Use separate source files and CMake-based source selection based on feature configuration, rather than using the C preprocessor for including/excluding different OSAL function groups. Refactor all implementation units to provide a separate header file for each functional group/subsystem. Remove "static" declaration on internal helper functions so they can be invoked from unit test.
2f67435
to
a2024ad
Compare
FYI - rebased to the 2020-04-15 baseline. Had to change the base branch back to master too (as it is!). |
Fix #285, Refactor OSAL to avoid inclusion of C files Manually merged to address merge conflicts
Fix #285, Refactor OSAL code selection
Merged in 7a7e6d1 |
Fix #285, Refactor OSAL to avoid inclusion of C files Manually merged to address merge conflicts
Fix #285, Refactor OSAL to avoid inclusion of C files Manually merged to address merge conflicts
Fix #285, Refactor OSAL to avoid inclusion of C files Manually merged to address merge conflicts
Fix nasa#285, Refactor OSAL to avoid inclusion of C files Manually merged to address merge conflicts
issue nasa#427, adding travis.yml for cppcheck on flight
Describe the contribution
Use separate source files and CMake-based source selection based on feature configuration, rather than using the C preprocessor for including/excluding different OSAL function groups.
Refactor all implementation units to provide a separate header file for each functional group/subsystem. Remove "static" declaration on internal helper functions so they can be invoked from unit test.
Fix #285 (primary)
Also Fix #214 and fix #195 (trivial fixes rolled in as part of refactoring) and fix #432 (separate commit)
Testing performed
Build and execute CFE for VxWorks, POSIX and RTEMS. Sanity check of CFE functions. Confirm all unit tests passing and coverage test of VxWorks is working (lcov shows 100% for covered modules).
Expected behavior changes
No impact to runtime code. Changes build system considerably, however.
osconfig.h
file - now replaced by a cmake configuration fileSystem(s) tested on
Ubuntu 18.04 LTS 64 bit (build host, native test)
i686-rtems4.11 cross build using QEMU
ppc-vxworks6.9 cross build using MCP750
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.