cFE Integration Candidate, Caelum+dev1 #2001

Hardware: [e.g. PC, SP0, MCP750]
OS: [e.g. Ubuntu 18.04, RTEMS 4.11, VxWorks 6.9]
Versions: [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps or tools]

Additional context
Part of nasa/cFS#390

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@PavLL
@zachar1a

Provide better status code conversion from OS_GetResourceName

Correct code that was not correctly using the CFE_SB_ValueToMsgId or CFE_SB_MsgIdToValue conversion wrappers where required to do so. This should be used whenever the value is intentionally converted to/from an integer. The CFE_SB_MsgId_t type should not be assumed to be an integer in nature.

Historically the CFE_SB_MSG_ID_INVALID constant was defined as 0xFFFFFFFF/-1, where 0 was considered valid. Although 0 is indeed valid for the first word of a CCSDS primary spacepacket header, it is not actually valid for use with SB. Because SB is now more decoupled from CCSDS header definitions, there are a number of advantages to using 0 instead of -1, as it is more passively safe: - Objects which are cleared as part of normal BSS clearing will be set invalid - Objects which are memset to zero will be set invalid In contrast, when the invalid value is nonzero, objects which are memset/cleared are valid by default, and must be actively set invalid to be safe.

This makes CFE_SB_MsgId_t to be a safe wrapper around CFE_SB_MsgId_Atom_t, such that the values cannot be silently/implicitly interchanged with other integers. This enforces that the MsgId/Value conversion helpers must be used when conversion to/from integers is intended.

Use a conversion macro, rather than directly referencing a member name/heirarchy within the CFE_MSG header structures, when calling SB APIs that accept a CFE_MSG_Message_t* type. The conversion macro is specific to how the headers are actually defined.

Adds a new module called "config" that tracks simple key/value pairs. All values are const. As a proof of concept, all version information is mirrored into this key store, and ES is updated to use this instead of the GLOBAL_CONFIGDATA when generating events.

Use an actual `void*` value when invoking functions that output an opaque pointer value. If necessary the value of this pointer can then be assigned to the real pointer type to dereference.

Utilize the common setup/wrapper functions in ut_support.c whenever possible MSG dispatching in the generic handler.

…ME-ClockState-Enum-t-in-cmd/tlm-and-handling Fix nasa#1546, use cfe time clock state enum t in cmd/tlm and handling nasa#1663

Fix nasa#245, nasa#1944, Message ID type improvements

Fix nasa#1984, avoid aliasing warnings

Fix nasa#1300, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t

Adds CFE_SB_RequestToSendEvent/CFE_SB_FinishSendEvent wrappers around all events generated by CFE_SB_TransmitMsgValidate. This is avoids the potential for a recursive loop if configured improperly.

Fix nasa#1952, patch for recursive event loop

Fix nasa#1672, return type conversions in CFE_ES_GetTaskName

…types Fix nasa#1818, EVS functional test add for different event types

Fix nasa#1988, consolidate repeated MSG stub setup in sb_UT

…unction-protos Fix nasa#1319, Remove extern from function prototypes Re-adds externs removed from CFE_ES_ObjectTable and CFE_ES_Global to fix RTEMS build

…gistry Fix nasa#1979, implement abstract config registry module

Fix nasa#1965, better message type pointer conversion

- Uses CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT

…d_msg_limits_in_TIME_services Fix nasa#1537, replacing hardcoded message limit in TIME services

…_IsNewOffset_only Fix nasa#1928, checking against IsNewOffset only nasa#1999

…zero-compare Fix nasa#1302, Use macro in CFE_ResourceId_IsDefined

Combines: nasa/cFE#2001 nasa/osal#1191 nasa/PSP#318 Includes: - nasa/cFE#1663, Use cfe time clock state enum t in cmd/tlm and handling - nasa/cFE#1973, EVS functional test add for different event types - nasa/cFE#1954, Patch for recursive event loop - nasa/cFE#1911, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t - nasa/cFE#1986, Avoid aliasing warnings - nasa/cFE#1975, Message ID type improvements - nasa/cFE#1974, CFE_SB_ValueToMsgId/MsgIdToValue wrappers - nasa/cFE#1663, Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling - nasa/cFE#1995, Consolidate repeated MSG stub setup in sb_UT - nasa/cFE#1873, Return type conversions in CFE_ES_GetTaskName - nasa/cFE#1966, Better message type pointer conversion - nasa/cFE#2002, Replacing hardcoded message limit in TIME services - nasa/cFE#1909, Use macro in CFE_ResourceId_IsDefined - nasa/cFE#1999, Checking against IsNewOffset only - nasa/osal#1186, Add Duplicate Check to Local Unit Test - nasa/osal#1178, Rename OS_XXXTime to OS_XXXLocalTime in comments - nasa/osal#1168, Fix vxWorks intLib stub aliasing issue - nasa/osal#1169, Recognize ifdef __cplusplus - nasa/osal#1180, Remove extern in stub prototypes - nasa/osal#1112, Add typedef for OSAL status codes - nasa/PSP#301, Sleep before exit when printing - nasa/PSP#314, Check the address in PSP get segment stubs - nasa/elf2cfetbl#89, Check get_sh_entsize(SectionHeader) value - nasa/cFS-GroundSystem#197, Free Address Info for Leak - nasa/sch_lab#95, use separate address variable - nasa/sch_lab#94, Use CFE_MSG_PTR conversion macro - nasa/sample_app#157, Use CFE_MSG_PTR conversion macro - nasa/ci_lab#95, Use CFE_MSG_PTR conversion macro - nasa/to_lab#107, Use CFE_MSG_PTR conversion macro - nasa/elf2cfetbl#93, Check get_sh_entsize(SectionHeader) value Co-authored by: Jacob Hageman [email protected] Co-authored by: Joseph Hickey [email protected] Co-authored by: Ariel Adams [email protected] Co-authored by: Paul [email protected] Co-authored by: Zachary Gonzalez [email protected] Co-authored by: Sam Price [email protected] Co-authored by: Shefali Sharma [email protected]

Combines: nasa/cFE#2001 nasa/osal#1191 nasa/PSP#318 Includes: - nasa/cFE#1663, Use cfe time clock state enum t in cmd/tlm and handling - nasa/cFE#1973, EVS functional test add for different event types - nasa/cFE#1954, Patch for recursive event loop - nasa/cFE#1911, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t - nasa/cFE#1986, Avoid aliasing warnings - nasa/cFE#1975, Message ID type improvements - nasa/cFE#1974, CFE_SB_ValueToMsgId/MsgIdToValue wrappers - nasa/cFE#1663, Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling - nasa/cFE#1995, Consolidate repeated MSG stub setup in sb_UT - nasa/cFE#1873, Return type conversions in CFE_ES_GetTaskName - nasa/cFE#1966, Better message type pointer conversion - nasa/cFE#2002, Replacing hardcoded message limit in TIME services - nasa/cFE#1909, Use macro in CFE_ResourceId_IsDefined - nasa/cFE#1999, Checking against IsNewOffset only - nasa/osal#1186, Add Duplicate Check to Local Unit Test - nasa/osal#1178, Rename OS_XXXTime to OS_XXXLocalTime in comments - nasa/osal#1168, Fix vxWorks intLib stub aliasing issue - nasa/osal#1169, Recognize ifdef __cplusplus - nasa/osal#1180, Remove extern in stub prototypes - nasa/osal#1112, Add typedef for OSAL status codes - nasa/PSP#301, Sleep before exit when printing - nasa/PSP#314, Check the address in PSP get segment stubs - nasa/elf2cfetbl#89, Check get_sh_entsize(SectionHeader) value - nasa/cFS-GroundSystem#197, Free Address Info for Leak - nasa/sch_lab#95, use separate address variable - nasa/sch_lab#94, Use CFE_MSG_PTR conversion macro - nasa/sample_app#157, Use CFE_MSG_PTR conversion macro - nasa/ci_lab#95, Use CFE_MSG_PTR conversion macro - nasa/to_lab#107, Use CFE_MSG_PTR conversion macro - nasa/elf2cfetbl#93, Check get_sh_entsize(SectionHeader) value Co-authored by: Jacob Hageman <[email protected]> Co-authored by: Joseph Hickey <[email protected]> Co-authored by: Ariel Adams <[email protected]> Co-authored by: Paul <[email protected]> Co-authored by: Zachary Gonzalez <[email protected]> Co-authored by: Sam Price <[email protected]> Co-authored by: Shefali Sharma <[email protected]>

Combines: nasa/cFE#2001 nasa/osal#1191 nasa/PSP#318 Includes: - nasa/cFE#1663, Use cfe time clock state enum t in cmd/tlm and handling - nasa/cFE#1973, EVS functional test add for different event types - nasa/cFE#1954, Patch for recursive event loop - nasa/cFE#1911, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t - nasa/cFE#1986, Avoid aliasing warnings - nasa/cFE#1975, Message ID type improvements - nasa/cFE#1974, CFE_SB_ValueToMsgId/MsgIdToValue wrappers - nasa/cFE#1663, Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling - nasa/cFE#1995, Consolidate repeated MSG stub setup in sb_UT - nasa/cFE#1873, Return type conversions in CFE_ES_GetTaskName - nasa/cFE#1966, Better message type pointer conversion - nasa/cFE#2002, Replacing hardcoded message limit in TIME services - nasa/cFE#1909, Use macro in CFE_ResourceId_IsDefined - nasa/cFE#1999, Checking against IsNewOffset only - nasa/osal#1186, Add Duplicate Check to Local Unit Test - nasa/osal#1178, Rename OS_XXXTime to OS_XXXLocalTime in comments - nasa/osal#1168, Fix vxWorks intLib stub aliasing issue - nasa/osal#1169, Recognize ifdef __cplusplus - nasa/osal#1180, Remove extern in stub prototypes - nasa/osal#1112, Add typedef for OSAL status codes - nasa/PSP#301, Sleep before exit when printing - nasa/PSP#314, Check the address in PSP get segment stubs - nasa/elf2cfetbl#89, Check get_sh_entsize(SectionHeader) value - nasa/cFS-GroundSystem#197, Free Address Info for Leak - nasa/sch_lab#95, use separate address variable - nasa/sch_lab#94, Use CFE_MSG_PTR conversion macro - nasa/sample_app#157, Use CFE_MSG_PTR conversion macro - nasa/ci_lab#95, Use CFE_MSG_PTR conversion macro - nasa/to_lab#107, Use CFE_MSG_PTR conversion macro - nasa/elf2cfetbl#93, Check get_sh_entsize(SectionHeader) value Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: Zachary Gonzalez <[email protected]> Co-authored-by: Sam Price <[email protected]> Co-authored-by: Shefali Sharma <[email protected]>

Combines: nasa/cFE#2001 nasa/osal#1191 nasa/PSP#318 nasa/ci_lab#101 nasa/sch_lab#102 nasa/to_lab#112 nasa/sample_app#163 nasa/cFS-GroundSystem#201 nasa/elf2cfetbl#98 Includes: *cFE* - nasa/cFE#1663, Use cfe time clock state enum t in cmd/tlm and handling - nasa/cFE#1973, EVS functional test add for different event types - nasa/cFE#1954, Patch for recursive event loop - nasa/cFE#1911, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t - nasa/cFE#1986, Avoid aliasing warnings - nasa/cFE#1975, Message ID type improvements - nasa/cFE#1974, CFE_SB_ValueToMsgId/MsgIdToValue wrappers - nasa/cFE#1663, Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling - nasa/cFE#1995, Consolidate repeated MSG stub setup in sb_UT - nasa/cFE#1873, Return type conversions in CFE_ES_GetTaskName - nasa/cFE#1966, Better message type pointer conversion - nasa/cFE#2002, Replacing hardcoded message limit in TIME services - nasa/cFE#1909, Use macro in CFE_ResourceId_IsDefined - nasa/cFE#1999, Checking against IsNewOffset only *osal* - nasa/osal#1186, Add Duplicate Check to Local Unit Test - nasa/osal#1178, Rename OS_XXXTime to OS_XXXLocalTime in comments - nasa/osal#1168, Fix vxWorks intLib stub aliasing issue - nasa/osal#1169, Recognize ifdef __cplusplus - nasa/osal#1180, Remove extern in stub prototypes - nasa/osal#1112, Add typedef for OSAL status codes *PSP* - nasa/PSP#301, Sleep before exit when printing - nasa/PSP#314, Check the address in PSP get segment stubs *Tools* - nasa/elf2cfetbl#89, Check get_sh_entsize(SectionHeader) value - nasa/elf2cfetbl#93, Check get_sh_entsize(SectionHeader) value - nasa/cFS-GroundSystem#197, Free Address Info for Leak *Apps* - nasa/sch_lab#95, use separate address variable - nasa/sch_lab#94, Use CFE_MSG_PTR conversion macro - nasa/sample_app#157, Use CFE_MSG_PTR conversion macro - nasa/ci_lab#95, Use CFE_MSG_PTR conversion macro - nasa/to_lab#107, Use CFE_MSG_PTR conversion macro Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: Zachary Gonzalez <[email protected]> Co-authored-by: Sam Price <[email protected]> Co-authored-by: Shefali Sharma <[email protected]>

- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4 - Standardize development indicators in cfe_version.h to use 0xFF in MissionRev to indicate development version

oliverhamburger and others added 23 commits July 14, 2021 14:56

Fix nasa#1546, use cfe time clock state enum t in cmd/tlm and handling

8aa153b

Fix nasa#1672, return type conversions in CFE_ES_GetTaskName

bc2a58f

Provide better status code conversion from OS_GetResourceName

Fix nasa#1319, Remove extern from function prototypes

d81ad3d

Fix nasa#1302, Use macro in CFE_ResourceId_IsDefined

f46bc4f

Fix nasa#1818, EVS functional test add for different event types

17f5770

Fix nasa#1984, avoid aliasing warnings

2f4a7fd

Use an actual `void*` value when invoking functions that output an opaque pointer value. If necessary the value of this pointer can then be assigned to the real pointer type to dereference.

Fix nasa#1988, consolidate repeated MSG stub setup in sb_UT

813744d

Utilize the common setup/wrapper functions in ut_support.c whenever possible MSG dispatching in the generic handler.

Fix nasa#1928, checking against IsNewOffset only

612a3d8

Merge pull request nasa#1663 from oliverhamburger/fix-1546-Use-CFE-TI…

6455485

…ME-ClockState-Enum-t-in-cmd/tlm-and-handling Fix nasa#1546, use cfe time clock state enum t in cmd/tlm and handling nasa#1663

Merge puill request nasa#1975 from jphickey/fix-245-caelum-opaque-msgid

33e6a71

Fix nasa#245, nasa#1944, Message ID type improvements

Fix nasa#1300, Add CFE_ES_MemAddOff structure

e91275e

Merge pull request nasa#1986 from jphickey/fix-1984-aliasing-warnings

965f0df

Fix nasa#1984, avoid aliasing warnings

Merge pull request nasa#1911 from pavll/fix-1300-es-memaddoff-struct

d7abb46

Fix nasa#1300, CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t

Fix nasa#1952, patch for recursive event loop

92cc55e

Adds CFE_SB_RequestToSendEvent/CFE_SB_FinishSendEvent wrappers around all events generated by CFE_SB_TransmitMsgValidate. This is avoids the potential for a recursive loop if configured improperly.

Merge pull request nasa#1954 from jphickey/fix-1952-recursive-event

dd62c2e

Fix nasa#1952, patch for recursive event loop

Merge pull request nasa#1873 from jphickey/fix-1672-errconv-gettaskname

c2836ce

Fix nasa#1672, return type conversions in CFE_ES_GetTaskName

Merge pull request nasa#1973 from pavll/fix-1818-evs-func-test-event-…

415c7b4

…types Fix nasa#1818, EVS functional test add for different event types

Merge pull request nasa#1995 from jphickey/fix-1988-sb-ut-calltaskpipe

7ca6161

Fix nasa#1988, consolidate repeated MSG stub setup in sb_UT

astrogeco force-pushed the integration-candidate branch 2 times, most recently from a93eba6 to a7eb777 Compare November 3, 2021 13:46

astrogeco added 2 commits November 3, 2021 17:10

Merge pull request nasa#1908 from pavll/fix-1319-remove-extern-from-f…

7839aae

…unction-protos Fix nasa#1319, Remove extern from function prototypes Re-adds externs removed from CFE_ES_ObjectTable and CFE_ES_Global to fix RTEMS build

Merge pull request nasa#1980 from jphickey/fix-1979-generic-config-re…

05ca2f6

…gistry Fix nasa#1979, implement abstract config registry module

astrogeco force-pushed the integration-candidate branch from a7eb777 to 05ca2f6 Compare November 3, 2021 21:41

astrogeco and others added 2 commits November 10, 2021 15:12

Merge pull request nasa#1966 from jphickey/fix-1965-cast-message-types

991014c

Fix nasa#1965, better message type pointer conversion

Fix nasa#1537, Replace hardcoded message limit in TIME

e52ac7a

- Uses CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT

astrogeco added 3 commits November 10, 2021 15:35

Merge pull request nasa#2002 from zachar1a/fix-#1537_replace_hardcode…

3535ddb

…d_msg_limits_in_TIME_services Fix nasa#1537, replacing hardcoded message limit in TIME services

Merge pull request nasa#1999 from zachar1a/fix-#1928_checking_against…

60dbe34

…_IsNewOffset_only Fix nasa#1928, checking against IsNewOffset only nasa#1999

Merge pull request nasa#1909 from pavll/fix-1302-use-macro-insteadof-…

b2e37c8

…zero-compare Fix nasa#1302, Use macro in CFE_ResourceId_IsDefined

astrogeco mentioned this pull request Nov 17, 2021

cFS Bundle Integration candidate: Caelum+dev1 nasa/cFS#390

Merged

2 tasks

astrogeco force-pushed the integration-candidate branch 2 times, most recently from 51a49fb to 9627a70 Compare November 18, 2021 19:40

astrogeco force-pushed the integration-candidate branch 3 times, most recently from 4599f33 to f45b732 Compare December 1, 2021 21:59

Update build baseline and bump to v7.0.0-rc4+dev39

5a1d138

- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4 - Standardize development indicators in cfe_version.h to use 0xFF in MissionRev to indicate development version

astrogeco force-pushed the integration-candidate branch from f45b732 to 5a1d138 Compare December 6, 2021 16:19

astrogeco marked this pull request as ready for review December 6, 2021 17:32

astrogeco merged commit c161cf0 into nasa:main Dec 6, 2021

skliper added this to the Draco milestone Jan 20, 2022

skliper added the draco-rc1 label Jul 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cFE Integration Candidate, Caelum+dev1 #2001

cFE Integration Candidate, Caelum+dev1 #2001

astrogeco commented Oct 19, 2021 •

edited

Loading

cFE Integration Candidate, Caelum+dev1 #2001

cFE Integration Candidate, Caelum+dev1 #2001

Conversation

astrogeco commented Oct 19, 2021 • edited Loading

astrogeco commented Oct 19, 2021 •

edited

Loading