From a782f4ffebad6760c0c09777998693cddd14cdad Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 7 Aug 2020 14:00:14 -0400 Subject: [PATCH] Fix #711, Clean TODOs and use old time logic by default --- fsw/cfe-core/src/inc/cfe_msg_typedefs.h | 2 +- fsw/cfe-core/unit-test/sb_UT.c | 53 ------------------- fsw/cfe-core/ut-stubs/ut_sb_stubs.c | 5 +- modules/msg/CMakeLists.txt | 2 +- .../msg/mission_inc/default_cfe_msg_sechdr.h | 2 +- 5 files changed, 4 insertions(+), 60 deletions(-) diff --git a/fsw/cfe-core/src/inc/cfe_msg_typedefs.h b/fsw/cfe-core/src/inc/cfe_msg_typedefs.h index 89a81f345..0397d0fd7 100644 --- a/fsw/cfe-core/src/inc/cfe_msg_typedefs.h +++ b/fsw/cfe-core/src/inc/cfe_msg_typedefs.h @@ -35,7 +35,7 @@ /* * Defines */ -/* TODO error bits won't fit a new module */ +/* Error bits won't fit a new module so reuse SB error codes */ #define CFE_MSG_BAD_ARGUMENT CFE_SB_BAD_ARGUMENT /**< \brief Error - bad argument */ #define CFE_MSG_NOT_IMPLEMENTED CFE_SB_NOT_IMPLEMENTED /**< \brief Error - not implemented */ #define CFE_MSG_WRONG_MSG_TYPE CFE_SB_WRONG_MSG_TYPE /**< \brief Error - wrong type */ diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c index 1afd91d44..c93b3e8d5 100644 --- a/fsw/cfe-core/unit-test/sb_UT.c +++ b/fsw/cfe-core/unit-test/sb_UT.c @@ -2546,7 +2546,6 @@ void Test_Unsubscribe_GetDestPtr(void) void Test_SendMsg_API(void) { SB_UT_ADD_SUBTEST(Test_SendMsg_NullPtr); -/* SB_UT_ADD_SUBTEST(Test_SendMsg_InvalidMsgId); - can't set invalid msgid, TODO remove */ SB_UT_ADD_SUBTEST(Test_SendMsg_NoSubscribers); SB_UT_ADD_SUBTEST(Test_SendMsg_MaxMsgSizePlusOne); SB_UT_ADD_SUBTEST(Test_SendMsg_BasicSend); @@ -2561,7 +2560,6 @@ void Test_SendMsg_API(void) SB_UT_ADD_SUBTEST(Test_SendMsg_ZeroCopyReleasePtr); SB_UT_ADD_SUBTEST(Test_SendMsg_DisabledDestination); SB_UT_ADD_SUBTEST(Test_SendMsg_SendWithMetadata); - /* SB_UT_ADD_SUBTEST(Test_SendMsg_InvalidMsgId_ZeroCopy); - can't set invalid msgid, TODO remove */ SB_UT_ADD_SUBTEST(Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy); SB_UT_ADD_SUBTEST(Test_SendMsg_NoSubscribers_ZeroCopy); } /* end Test_SendMsg_API */ @@ -2579,27 +2577,6 @@ void Test_SendMsg_NullPtr(void) } /* end Test_SendMsg_NullPtr */ -/* -** Test response to sending a message with an invalid ID -*/ -/* TODO remove, this test is no longer valid since you can't set an invalid MSGID */ -void Test_SendMsg_InvalidMsgId(void) -{ - SB_UT_Test_Tlm_t TlmPkt; - CFE_SB_MsgPtr_t TlmPktPtr = (CFE_SB_MsgPtr_t) &TlmPkt; - - CFE_SB_InitMsg(&TlmPkt, SB_UT_ALTERNATE_INVALID_MID, - sizeof(TlmPkt), true); - CFE_SB_SetMsgId(TlmPktPtr, CFE_SB_INVALID_MSG_ID); - - ASSERT_EQ(CFE_SB_SendMsg(TlmPktPtr), CFE_SB_BAD_ARGUMENT); - - EVTCNT(1); - - EVTSENT(CFE_SB_SEND_INV_MSGID_EID); - -} /* end Test_SendMsg_InvalidMsgId */ - /* ** Test response to sending a message which has no subscribers */ @@ -3124,36 +3101,6 @@ void Test_SendMsg_SendWithMetadata(void) } /* end Test_SendMsg_SendWithMetadata */ -/* -** Test response to sending a message with an invalid ID and ZeroCopy is set -*/ -void Test_SendMsg_InvalidMsgId_ZeroCopy(void) -{ - SB_UT_Test_Tlm_t TlmPkt; - CFE_SB_MsgPtr_t TlmPktPtr; - - TlmPktPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), - (CFE_SB_ZeroCopyHandle_t *) &TlmPkt); - - if (TlmPktPtr == NULL) - { - UtAssert_Failed("Unexpected NULL pointer returned from ZeroCopyGetPtr"); - } - else - { - CFE_SB_InitMsg(TlmPktPtr, SB_UT_ALTERNATE_INVALID_MID, - sizeof(SB_UT_Test_Tlm_t), true); - ASSERT_EQ(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_INCREMENT_TLM, - CFE_SB_SEND_ZEROCOPY), CFE_SB_BAD_ARGUMENT); - - } - - EVTCNT(1); - - EVTSENT(CFE_SB_SEND_INV_MSGID_EID); - -} /* end Test_SendMsg_InvalidMsgId_ZeroCopy */ - /* ** Test response to sending a message with the message size larger than allowed ** and ZeroCopy is set diff --git a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c index 688e8c6a0..bfa2bdf89 100644 --- a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c +++ b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c @@ -915,8 +915,6 @@ bool CFE_SB_ValidateChecksum(CFE_SB_MsgPtr_t MsgPtr) return (bool) status; } -// TODO remove -#if 0 void *CFE_SB_GetUserData(CFE_SB_MsgPtr_t MsgPtr) { UT_Stub_RegisterContextGenericArg(UT_KEY(CFE_SB_GetUserData), MsgPtr); @@ -930,7 +928,7 @@ void *CFE_SB_GetUserData(CFE_SB_MsgPtr_t MsgPtr) if (UT_Stub_CopyToLocal(UT_KEY(CFE_SB_GetUserData), &Result, sizeof(Result)) != sizeof(Result)) { BytePtr = (uint8 *)MsgPtr; - if (CCSDS_RD_TYPE(MsgPtr->Hdr) != CCSDS_TLM) + if ((MsgPtr->Byte[0] & 0x10) != 0) { HdrSize = CFE_SB_CMD_HDR_SIZE; } @@ -944,7 +942,6 @@ void *CFE_SB_GetUserData(CFE_SB_MsgPtr_t MsgPtr) return Result; } -#endif void CFE_SB_SetTotalMsgLength (CFE_SB_MsgPtr_t MsgPtr,uint16 TotalLength) { diff --git a/modules/msg/CMakeLists.txt b/modules/msg/CMakeLists.txt index d1abfb5eb..1d6f2e04c 100644 --- a/modules/msg/CMakeLists.txt +++ b/modules/msg/CMakeLists.txt @@ -21,7 +21,7 @@ set(${DEP}_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_msgid_shared.c ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_checksum.c ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_fc.c - ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_time.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/cfe_msg_sechdr_time_old.c ) # Source selection for if CCSDS extended header is included, and MsgId version use diff --git a/modules/msg/mission_inc/default_cfe_msg_sechdr.h b/modules/msg/mission_inc/default_cfe_msg_sechdr.h index f49eb938d..d4d7a678a 100644 --- a/modules/msg/mission_inc/default_cfe_msg_sechdr.h +++ b/modules/msg/mission_inc/default_cfe_msg_sechdr.h @@ -38,7 +38,7 @@ * Defines */ -/* TODO eventually these go away w/ single framework implementation */ +/* These go away w/ single framework implementation */ /* CCSDS_TIME_SIZE is specific to the selected CFE_SB time format */ #if (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_16_SUBS) /* 32 bits seconds + 16 bits subseconds */