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

cFE Integration candidate: Caelum-rc4+dev50
jphickey · May 12, 2023 · 4deea95 · 4deea95
2 parents e3b6767 + 2a0a766
commit 4deea95
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev312
+- adjust UT pool buffer size for platform config
+- Remove unused CFE_PLATFORM_ES_RESET_AREA_SIZE
+- See <https://github.com/nasa/cFE/pull/2328> and <https://github.com/nasa/cFE/pull/2331>
+
 ## Development Build: v7.0.0-rc4+dev304
 - reorganize headers
 - Update XML files per interoperability testing

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   304 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   312 /**< @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/core_api/ut-stubs/src/cfe_es_handlers.c b/modules/core_api/ut-stubs/src/cfe_es_handlers.c
@@ -420,6 +420,8 @@ void UT_DefaultHandler_CFE_ES_GetPoolBuf(void *UserObj, UT_EntryKey_t FuncKey, c
              */
             UtAssert_Failed("Pool buffer empty in %s: need at least %lu bytes, given %lu", __func__,
                             (unsigned long)PositionEnd, (unsigned long)PoolSize);
+
+            UtAssert_Abort("Configuration error, pool buffer too small for test cases");
         }
     }
 

diff --git a/modules/core_private/ut-stubs/src/ut_support.c b/modules/core_private/ut-stubs/src/ut_support.c
@@ -50,7 +50,7 @@ typedef union
     long long int AlignLong;
     long double   AlignDbl;
     void *        AlignPtr;
-    char          Content[128 * 1024];
+    char          Content[2 * CFE_PLATFORM_ES_MAX_BLOCK_SIZE];
 } UT_Buffer_t;
 
 static UT_Buffer_t UT_CFE_ES_MemoryPool;

diff --git a/modules/es/config/default_cfe_es_internal_cfg.h b/modules/es/config/default_cfe_es_internal_cfg.h
@@ -328,29 +328,6 @@
 */
 #define CFE_PLATFORM_ES_USER_RESERVED_SIZE (1024 * 1024)
 
-/**
-**  \cfeescfg Define ES Reset Area Size
-**
-**  \par Description:
-**       The ES Reset Area Size. This is the size in bytes of the cFE Reset variable
-**       and log area. This is a block of memory used by the cFE to store the system
-**       log ER Log and critical reset variables. This is 4 of 4 of the memory areas
-**       that are preserved during a processor reset.
-**       Note: This area must be sized large enough to hold all of the data
-**       structures. It should be automatically sized based on the CFE_ES_ResetData_t
-**       type, but circular dependencies in the headers prevent it from being defined
-**       this way.
-**       NOTE: Changing this value changes memory allocation, and may
-**       require changes to platform specific values (in CFE_PSP) such as
-**       USER_RESERVED_MEM in VxWorks depending on the memory areas
-**       being used for preserved data and on OS specific behavior.
-**
-**  \par Limits
-**       There is a lower limit of 153600 (150KBytes) and an upper limit of UINT_MAX
-**       (4 Gigabytes) on this configuration parameter.
-*/
-#define CFE_PLATFORM_ES_RESET_AREA_SIZE (170 * 1024)
-
 /**
 **  \cfeescfg Define Memory Pool Alignment Size
 **