cFE Integration candidate: 2021-05-25 #1568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Recognize the special string "NULL" to indicate no entry point should be called for the library. Equivalent to leaving the field empty.
Use (int) with %d conversions for portability
Adds a "install_custom.cmake" hook that can be put into a CPU-specific subdirectory under the "defs" directory, that can perform extra installation steps as required for the project/mission. Tweaks the "add_cfe_tables" function such that it can also be called from the install_custom.cmake script to generate additional/alternative table binary files for that CPU. The main update is that it uses the "APP_NAME" parameter to associate the table files with the app library, so the same set of include files can be used. This relies on the target-scope properties being used. Historically that string wasn't verified, it could have been any unique string, but now it should match the app if this is to work as expected.
Changing the implementation return types to CFE_Status_t to match the function prototypes.
Fix #1522, add printf format casts
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 24, 2021
Combines: - nasa/cFE#1568 - nasa/osal#1050 Includes: - nasa/cFE#1524, add printf format casts - nasa/cFE#1520, accept "NULL" as entry point - nasa/cfe #1549, add capability to generate multiple tables - nasa/osal#1026, Add count sem timeout test
|
@jphickey looks like #1549 broke SCH_LAB, see https://github.com/nasa/cFS/runs/2658714501?check_suite_focus=true |
|
I will check into it |
For a table build where the app name passed to cfe_add_tables does not match the actual app name, it must use the APP_DYNAMIC_TARGET_LIST and APP_STATIC_TARGET_LIST variables to get the target list for installation.
|
@astrogeco - Corrected as hotfix in commit d7073fa. I had originally patched my build to use the correct app names in the sch_lab and to_lab table builds. When I set the name back it caused no table file to be built. Fixed in the above commit by referencing the original list variable in that case. |
|
Also worth noting, I submitted nasa/sch_lab#80 to correct for the infinite loop observed here. Missing a table file is a condition that should cause SCH_LAB to simply exit with an error - not a continuous spew of error events. |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 26, 2021
Combines: - cfe v6.8.0-rc1+dev593 (nasa/cFE#1568) - osal v5.1.0-rc1+dev458 (nasa/osal#1050) Includes: - nasa/cFE#1524, add printf format casts - nasa/cFE#1520, accept "NULL" as entry point - nasa/cfe #1549, add capability to generate multiple tables - nasa/cFE#1551, fixes discrepancies (return type, parameter names, etc) between function protoypes and implementation. Updates stubs accordingly - nasa/osal#1026, Add count sem timeout test - nasa/osal#1026, defer cancellation when BSP locked
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Part of nasa/cFS#260
Testing
cFE Checks: https://github.com/nasa/cFE/pull/1568/checks
cFS Bundle Checks: https://github.com/nasa/cfs/pull/260/checks
Description
PR #1524
Fix #1522, add printf format casts
Uses (int) with %d conversions in
UtAssert_TrueandUtPrintffor platform portability.PR #1520
Fix #1505, accept "NULL" as entry point
Specifying the special string NULL as the entry point in a startup script results in no entry point being called for the library. Equivalent to leaving the field empty.
PR #1549
Fix #1538, add capability to generate multiple tables
[build system] Adds an
install_custom.cmakehook that can added to a CPU-specific subdirectory under the "defs" directory. This hook can perform extra installation steps as required for the custom implementation.Tweaks the
add_cfe_tablesfunction so it can be called from theinstall_custom.cmakescript to generate additional/alternative table binary files for that CPU.add_cfe_tablesnow uses the "APP_NAME" parameter to associate the table files with the app library, so the same set of include files can be used. Still allows any unique string to be used as "APP_NAME" for backward compatibility. The script will now generate a "Note" message to the user if it does not match an application name.If the multiple table feature is used, it actually needs to match the application name, or else the include paths may be incomplete.
PR #1551
Fix #1474, #1552, Resolve API prototype/implementation discrepancies
Removes discrepancies (return type, parameter names, etc) between function prototypes and implementation. Also fixes some but not all use of
CFE_Status_tin the implementations. Updates ut-stubs accordingly.Authors
@jphickey
@skliper
@zachar1a