Merge pull request nasa#2456 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev62
thnkslprpt · Oct 23, 2023 · 0316672 · 0316672
2 parents 9de5db7 + 605d98c
commit 0316672
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # Changelog
 
-## Development Build:v7.0.0-rc4+dev401
+## Development Build: v7.0.0-rc4+dev405
+- add code coverage for null check
+- See <https://github.com/nasa/cFE/pull/2377>
+
+## Development Build: v7.0.0-rc4+dev401
 - minor reorg of message headers
 - See <https://github.com/nasa/cFE/pull/2453>
 
-## Development Build:v7.0.0-rc4+dev395
+## Development Build: v7.0.0-rc4+dev395
 - Adds an empty string or null pointer check for pipe creation
 - crc calculation refactor
 - See <https://github.com/nasa/cFE/pull/2440> and <https://github.com/nasa/cFE/pull/2450>

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   401 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   405 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */

diff --git a/modules/es/fsw/src/cfe_es_generic_pool.h b/modules/es/fsw/src/cfe_es_generic_pool.h
@@ -158,6 +158,39 @@ int32 CFE_ES_GenPoolInitialize(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t StartO
  */
 int32 CFE_ES_GenPoolGetBlock(CFE_ES_GenPoolRecord_t *PoolRecPtr, size_t *BlockOffsetPtr, size_t ReqSize);
 
+/*---------------------------------------------------------------------------------------*/
+/**
+ * \brief Create a new block of the given size.
+ *
+ * \note Internal helper routine only, not part of API.
+ *
+ * \param[inout] PoolRecPtr      Pointer to pool structure
+ * \param[in]    BucketId        Bucket ID
+ * \param[in]    NewSize         Size of block
+ * \param[out]   BlockOffsetPtr  Location to output new block offset 
+ *
+ * \return #CFE_SUCCESS, or error code #CFE_ES_BUFFER_NOT_IN_POOL #CFE_ES_ERR_MEM_BLOCK_SIZE
+ *         \ref CFEReturnCodes
+ */
+int32 CFE_ES_GenPoolCreatePoolBlock(CFE_ES_GenPoolRecord_t *PoolRecPtr, uint16 BucketId, size_t NewSize, 
+                                    size_t *BlockOffsetPtr);
+
+/*---------------------------------------------------------------------------------------*/
+/**
+ * \brief Find and re-allocate a previously returned block
+ *
+ * \note Internal helper routine only, not part of API.
+ *
+ * \param[inout] PoolRecPtr      Pointer to pool structure
+ * \param[in]    BucketId        Bucket ID
+ * \param[in]    NewSize         Size of block
+ * \param[out]   BlockOffsetPtr  Location to output new block offset 
+ *
+ * \return #CFE_SUCCESS, or error code #CFE_ES_BUFFER_NOT_IN_POOL \ref CFEReturnCodes
+ */
+int32 CFE_ES_GenPoolRecyclePoolBlock(CFE_ES_GenPoolRecord_t *PoolRecPtr, uint16 BucketId, size_t NewSize,
+                                     size_t *BlockOffsetPtr);
+
 /*---------------------------------------------------------------------------------------*/
 /**
  * \brief Returns a block to the pool

diff --git a/modules/es/ut-coverage/es_UT.c b/modules/es/ut-coverage/es_UT.c
@@ -2457,6 +2457,16 @@ void TestGenericPool(void)
     /* Reset the structure so it will rebuild */
     Pool1.TailPosition = 0;
     CFE_UtAssert_SUCCESS(CFE_ES_GenPoolRebuild(&Pool1));
+
+    /* Branch coverage for no buffer in pool */
+    ES_ResetUnitTest();
+    UtAssert_INT32_EQ(CFE_ES_GenPoolCreatePoolBlock(&Pool1, 0, Pool1.Buckets[0].BlockSize, &Offset1),
+                      CFE_ES_BUFFER_NOT_IN_POOL);
+
+    ES_ResetUnitTest();
+    UtAssert_INT32_EQ(CFE_ES_GenPoolRecyclePoolBlock(&Pool1, 0, Pool1.Buckets[0].BlockSize, &Offset1),
+                      CFE_ES_BUFFER_NOT_IN_POOL);
+
 }
 
 void TestTask(void)