Skip to content

Fix #2030, array length calculation for perf structs#2031

Merged
astrogeco merged 1 commit intonasa:mainfrom
jphickey:fix-2030-es-perf-array-len
Jan 21, 2022
Merged

Fix #2030, array length calculation for perf structs#2031
astrogeco merged 1 commit intonasa:mainfrom
jphickey:fix-2030-es-perf-array-len

Conversation

@jphickey
Copy link
Contributor

Describe the contribution
Cleans up the array length calculation for perf structs to not assume a specific base element type (uint32). This also makes the definitions much more readable.

Fixes #2030

Testing performed
Build and sanity check CFE

Expected behavior changes
None w/current structure definitions. Just a bit of future-proofing and clean up.

System(s) tested on
Ubuntu 21.10

Additional context
Notably the EDS build actually does use a different base type for this array, so this is not just cosmetic. But this is a worthwhile cleanup regardless.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Cleans up the array length calculation for perf structs to not assume
a specific base element type (uint32).  This also makes the definitions
much more readable.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Jan 18, 2022
@astrogeco astrogeco removed the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Jan 19, 2022
@astrogeco
Copy link
Contributor

CCB:2022-01-19 APPROVED

  • makes this "type agnostic"

@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Jan 19, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 19, 2022
*cFE*

nasa/cFE#2015, Add FS Functional test
nasa/cFE#2012, Fix mismatched foreach in cmake function
nasa/cFE#2013, Improved code highlighting in cFE Application Developers Guide
nasa/cFE#2027, CFE_FS_ParseInputFileNameEx avoid uninit var
nasa/cFE#2031, Fix array length calculation for perf structs
nasa/cFE#2023, Limit SBR UT loops
nasa/cFE#2029, Initialize BlockData in ES UT
nasa/cFE#2025, Fix osal_id_t type conversion in es_UT.c
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 20, 2022
*cFE*

nasa/cFE#2011, Reuse CodeQL, Static Analysis, and Format Check
nasa/cFE#2015, Add FS Functional test
nasa/cFE#2012, Fix mismatched foreach in cmake function
nasa/cFE#2013, Improved code highlighting in cFE Application Developers Guide
nasa/cFE#2027, CFE_FS_ParseInputFileNameEx avoid uninit var
nasa/cFE#2031, Fix array length calculation for perf structs
nasa/cFE#2023, Limit SBR UT loops
nasa/cFE#2029, Initialize BlockData in ES UT
nasa/cFE#2025, Fix osal_id_t type conversion in es_UT.c
@astrogeco astrogeco merged commit f8661cf into nasa:main Jan 21, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 21, 2022
Combines:

nasa/cFE#2019, cFE v7.0.0-rc4+dev60
nasa/osal#1212, osal v6.0.0-rc4+dev29
nasa/sch_lab#105, sch_lab v2.5.0-rc4+dev13

Includes:

*cFE*

nasa/cFE#2033, Add CFE_ES_AppInfo_t element documentation
nasa/cFE#2011, Reuse CodeQL, Static Analysis, and Format Check
nasa/cFE#2015, Add FS Functional test
nasa/cFE#2012, Fix mismatched foreach in cmake function
nasa/cFE#2013, Improved code highlighting in cFE Application Developers Guide
nasa/cFE#2027, CFE_FS_ParseInputFileNameEx avoid uninit var
nasa/cFE#2031, Fix array length calculation for perf structs
nasa/cFE#2023, Limit SBR UT loops
nasa/cFE#2029, Initialize BlockData in ES UT
nasa/cFE#2025, Fix osal_id_t type conversion in es_UT.c

*osal*

nasa/osal#1206, Search global and local symbol tables
nasa/osal#1201, Add missing space to UtAssert_STUB_COUNT
nasa/osal#1202, Add UINT8 and UINT16 equivalents for UtAssert_UINT32_<Comparison> macros
nasa/osal#1203, correct warnings on gcc11
nasa/osal#1211, Set output in OS_stat handler
nasa/osal#1190, Reuse CodeQL, Static Analysis, Format Check

*other*

nasa/sch_lab#104, Add option to configure base tick rate

*Continuous Integration Updates*

nasa/PSP#317, Reuse CodeQL, Static Analysis, and Format Check

nasa/sample_lib#72, Reuse CodeQL, Static Analysis, and Format Check
nasa/sample_app#162, Reuse CodeQL, Static Analysis, and Format Check
nasa/ci_lab#100, Reuse CodeQL, Static Analysis, and Format Check
nasa/to_lab#111, Reuse CodeQL, Static Analysis, and Format Check

nasa/tblCRCTool#59, Reuse CodeQL, Static Analysis, and Format Check
nasa/elf2cfetbl#97, Reuse CodeQL, Static Analysis, and Format Check
nasa/cFS-GroundSystem#200, Reuse CodeQL, Static Analysis, and Format Check

Co-authored-by: Ariel Adams     <[email protected]>
Co-authored-by: Jacob Hageman   <[email protected]>
Co-authored-by: Joseph Hickey   <[email protected]>
Co-authored-by: Kurtis Dinelle  <[email protected]>
Co-authored-by: Paul            <[email protected]>
Co-authored-by: Adrien Chardon  <[email protected]>
@skliper skliper added this to the Draco milestone Mar 28, 2022
@jphickey jphickey deleted the fix-2030-es-perf-array-len branch October 20, 2022 20: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 draco-rc1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ES PERF array size calculation assumes "uint32" array base type

3 participants