Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE #1592

skliper · 2021-06-01T16:51:20Z

Describe the contribution
Fix #1308 - removed redundant set of CFE_CPU_ID_VALUE if not set.

And checked as well as assigned to CFE_CPU_ID_VALUE here:

Lines 20 to 22 in 176e3df

    
           if (NOT DEFINED ${TGTNAME}_PROCESSORID) 
        
             message(FATAL_ERROR "${TGTNAME}_PROCESSORID must be defined to link a final exe") 
        
           endif (NOT DEFINED ${TGTNAME}_PROCESSORID)

cFE/cmake/target/CMakeLists.txt

Lines 127 to 133 in 176e3df

    
           target_compile_definitions(core-${TGTNAME} PRIVATE 
        
               CFE_DEFAULT_MODULE_EXTENSION="${CMAKE_SHARED_MODULE_SUFFIX}" 
        
               CFE_DEFAULT_CORE_FILENAME="$<TARGET_FILE_NAME:core-${TGTNAME}>" 
        
               CFE_CPU_NAME_VALUE="${TGTNAME}" 
        
               CFE_SPACECRAFT_ID_VALUE=${SPACECRAFT_ID} 
        
               CFE_CPU_ID_VALUE=${${TGTNAME}_PROCESSORID} 
        
           )

and used here:

cFE/cmake/target/src/target_config.c

Line 172 in 176e3df

.Default_CpuId = CFE_CPU_ID_VALUE,

Testing performed
Removed assignment of cpu1_PROCESSORID and confirmed error was generated by target/CMakeLists.txt:
cpu1_PROCESSORID must be defined to link a final exe

Expected behavior changes
None as long as required elements are defined.

System(s) tested on

Hardware: Intel I5/Docker
OS: Ubuntu 18.04
Versions: Bundle Main + this commit

Additional context
None

Third party code
None

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

astrogeco · 2021-06-02T16:25:37Z

CCB:2021-06-02 APPROVED

nasa/cFE#1566, Simplify CFE_FS_SetTimestamp and fix syslog typo nasa/cFE#1592, Removed redundant check/set of CFE_CPU_ID_VALUE nasa/cFE#1593, add time get reference error bit nasa/osal#1063, const correct OS_SelectFdIsSet

nasa/cFE#1619 - cfe v6.8.0-rc1+dev693 nasa/osal#1076 - osal v5.1.0-rc1+dev530 nasa/PSP#296 - psp v1.5.0-rc1+dev118 *Documentation Updates:* nasa/cFE#1598, Updated FS Read/WriteHeader API return documentation nasa/cFE#1601, Document CFE_ES_RunLoop increment task counter behavior nasa/cFE#1602, Document CFE_TBL_Unregister use-case nasa/cFE#1603, Update version description per current design *Standardize docs generation:* nasa/cFE#1615, standardize on "docs" subdirectory nasa/osal#1071, rename doc to docs nasa/PSP#294, rename doc to docs *Coding Standard:* nasa/osal#1042 nasa/PSP#292 **Mutex for UTAssert** nasa/cFE#1596, provide CFE assert lock/unlock nasa/osal#1065, add mutex lock around UtAssert globals *Resolve API-UT discrepancies:* nasa/osal#1055, idmap API nasa/osal#1056, file API nasa/osal#1057, filesys API nasa/osal#1060, socket API nasa/osal#1064, select API **Other cFE ixes** nasa/cFE#1566, Simplify CFE_FS_SetTimestamp and fix syslog typo nasa/cFE#1592, Removed redundant check/set of CFE_CPU_ID_VALUE nasa/cFE#1593, add time get reference error bit nasa/cFE#1600, Add workflow to build cFE documentation nasa/cFE#1609, Requirements updates nasa/cFE#1610, ES/ResourceID documentation cleanup nasa/cFE#1613, allow multiple sources in add_cfe_coverage_test nasa/cFE#1586, add ES Misc Functional test nasa/cFE#1607, add Mempool functional tests nasa/cFE#1605, Clean/simplify version header and reporting nasa/cFE#1612, doxygen cleanup nasa/cFE#1611, Prepend system log messages with function name nasa/osal#1063, const correct OS_SelectFdIsSet nasa/osal#1073, Fix OS_Select doxygen errors nasa/osal#1073, Add missing OS_Select param doc nasa/osal#1067, Add Workflow to build and verify OSAL API Guide nasa/osal#1070, add detail design template nasa/osal#1072, Update error codes and documentation nasa/osal#1075, Increase UT object limit for testing Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Alex Campbell <[email protected]> Co-authored-by: Jose F Martinez Pedraza <[email protected]>

nasa/cFE#1619 - cfe v6.8.0-rc1+dev693 nasa/osal#1076 - osal v5.1.0-rc1+dev530 nasa/PSP#296 - psp v1.5.0-rc1+dev118 *Documentation Updates:* nasa/cFE#1598, Updated FS Read/WriteHeader API return documentation nasa/cFE#1601, Document CFE_ES_RunLoop increment task counter behavior nasa/cFE#1602, Document CFE_TBL_Unregister use-case nasa/cFE#1603, Update version description per current design *Standardize docs generation:* nasa/cFE#1615, standardize on "docs" subdirectory nasa/osal#1071, rename doc to docs nasa/PSP#294, rename doc to docs *Coding Standard:* nasa/osal#1042 nasa/PSP#292 **Mutex for UTAssert** nasa/cFE#1596, provide CFE assert lock/unlock nasa/osal#1065, add mutex lock around UtAssert globals *Resolve API-UT discrepancies:* nasa/osal#1055, idmap API nasa/osal#1056, file API nasa/osal#1057, filesys API nasa/osal#1060, socket API nasa/osal#1064, select API **Other cFE Fixes** nasa/cFE#1566, Simplify CFE_FS_SetTimestamp and fix syslog typo nasa/cFE#1592, Removed redundant check/set of CFE_CPU_ID_VALUE nasa/cFE#1593, add time get reference error bit nasa/cFE#1600, Add workflow to build cFE documentation nasa/cFE#1609, Requirements updates nasa/cFE#1610, ES/ResourceID documentation cleanup nasa/cFE#1613, allow multiple sources in add_cfe_coverage_test nasa/cFE#1586, add ES Misc Functional test nasa/cFE#1607, add Mempool functional tests nasa/cFE#1605, Clean/simplify version header and reporting nasa/cFE#1612, doxygen cleanup nasa/cFE#1611, Prepend system log messages with function name **Other osal Fixes** nasa/osal#1063, const correct OS_SelectFdIsSet nasa/osal#1073, Fix OS_Select doxygen errors nasa/osal#1073, Add missing OS_Select param doc nasa/osal#1067, Add Workflow to build and verify OSAL API Guide nasa/osal#1070, add detail design template nasa/osal#1072, Update error codes and documentation nasa/osal#1075, Increase UT object limit for testing Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Alex Campbell <[email protected]> Co-authored-by: Jose F Martinez Pedraza <[email protected]>

Fix nasa#1308, Removed redundant set of CFE_CPU_ID_VALUE

8db52ec

skliper added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Jun 1, 2021

skliper added this to the 7.0.0 milestone Jun 1, 2021

skliper changed the title ~~Fix #1308, Removed redundant set of CFE_CPU_ID_VALUE~~ Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE Jun 1, 2021

astrogeco added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Jun 2, 2021

astrogeco changed the base branch from main to integration-candidate June 10, 2021 22:33

astrogeco merged commit 07db368 into nasa:integration-candidate Jun 10, 2021

This was referenced Jun 15, 2021

cFE Integration candidate: 2021-06-15 #1619

Merged

cFS Bundle Integration Candidate:2021-06-15 nasa/cFS#265

Merged

skliper deleted the fix1308-require_cpuid_def branch October 22, 2021 19:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE #1592

Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE #1592

skliper commented Jun 1, 2021

astrogeco commented Jun 2, 2021

	if (NOT DEFINED ${TGTNAME}_PROCESSORID)
	message(FATAL_ERROR "${TGTNAME}_PROCESSORID must be defined to link a final exe")
	endif (NOT DEFINED ${TGTNAME}_PROCESSORID)

	target_compile_definitions(core-${TGTNAME} PRIVATE
	CFE_DEFAULT_MODULE_EXTENSION="${CMAKE_SHARED_MODULE_SUFFIX}"
	CFE_DEFAULT_CORE_FILENAME="$<TARGET_FILE_NAME:core-${TGTNAME}>"
	CFE_CPU_NAME_VALUE="${TGTNAME}"
	CFE_SPACECRAFT_ID_VALUE=${SPACECRAFT_ID}
	CFE_CPU_ID_VALUE=${${TGTNAME}_PROCESSORID}
	)

Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE #1592

Fix #1308, Removed redundant check/set of CFE_CPU_ID_VALUE #1592

Conversation

skliper commented Jun 1, 2021

astrogeco commented Jun 2, 2021