Skip to content

Commit 32f3dee

Browse files
astrogecoastrogeco
authored
Merge pull request #1008 from nasa/integration-candidate
Integration Candidate: 2020-11-10
2 parents 9804b59 + aed7723 commit 32f3dee

File tree

18 files changed

+141
-121
lines changed

18 files changed

+141
-121
lines changed

‎README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
1010

1111
## Version History
1212

13+
### Development Build: 6.8.0-rc1+dev179
14+
15+
- Adds macros for more compact calls to `CFE_EVS_SendEvent`, making the type be part of the function name.
16+
- The sample configs leap seconds default value is now up to date. (As of Oct 2020)
17+
- Removed the clear=false logic (and clear parameter) `CFE_MSG_Init()` now always zeroes entire message and sets defaults.
18+
- Adds flags parameter to calls to `OS_ModuleLoad()`. Initially just pass 0 (GLOBAL) to maintain old behavior.
19+
- Updates `CFE_ES_RegisterCDSEx` stub to match current signature
20+
- Includes `cfe_private.h` for stubs that implement related elements.
21+
- See <https://github.com/nasa/cFE/pull/1008>
22+
1323
### Development Build: 6.8.0-rc1+dev164
1424

1525
- Keeps task names under 16 chars to make more debugger friendly, regardless

‎cmake/arch_build.cmake‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function(add_cfe_app APP_NAME APP_SRC_FILES)
8181

8282
# currently this will build an app with either static linkage or shared/module linkage,
8383
# but this does not currently support both for a single arch (could be revised if that is needed)
84-
if (APP_INSTALL_LIST)
84+
if (APP_DYNAMIC_TARGET_LIST)
8585
set(APPTYPE "MODULE")
8686
else()
8787
set(APPTYPE "STATIC")
@@ -90,9 +90,10 @@ function(add_cfe_app APP_NAME APP_SRC_FILES)
9090
# Create the app module
9191
add_library(${APP_NAME} ${APPTYPE} ${APP_SRC_FILES} ${ARGN})
9292

93-
if (APP_INSTALL_LIST)
94-
cfs_app_do_install(${APP_NAME} ${APP_INSTALL_LIST})
95-
endif (APP_INSTALL_LIST)
93+
# An "install" step is only needed for dynamic/runtime loaded apps
94+
if (APP_DYNAMIC_TARGET_LIST)
95+
cfs_app_do_install(${APP_NAME} ${APP_DYNAMIC_TARGET_LIST})
96+
endif (APP_DYNAMIC_TARGET_LIST)
9697

9798
endfunction(add_cfe_app)
9899

@@ -117,7 +118,7 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)
117118
# Get name without extension (NAME_WE) and append to list of tables
118119
get_filename_component(TBLWE ${TBL} NAME_WE)
119120

120-
foreach(TGT ${APP_INSTALL_LIST})
121+
foreach(TGT ${APP_STATIC_TARGET_LIST} ${APP_DYNAMIC_TARGET_LIST})
121122
set(TABLE_DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/tables_${TGT}")
122123
file(MAKE_DIRECTORY ${TABLE_DESTDIR})
123124
list(APPEND TBL_LIST "${TABLE_DESTDIR}/${TBLWE}.tbl")
@@ -162,7 +163,8 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)
162163
)
163164
# Create the install targets for all the tables
164165
install(FILES ${TABLE_DESTDIR}/${TBLWE}.tbl DESTINATION ${TGT}/${INSTALL_SUBDIR})
165-
endforeach(TGT ${APP_INSTALL_LIST})
166+
endforeach(TGT ${APP_STATIC_TARGET_LIST} ${APP_DYNAMIC_TARGET_LIST})
167+
166168

167169
endforeach(TBL ${TBL_SRC_FILES} ${ARGN})
168170

@@ -435,33 +437,34 @@ function(process_arch SYSVAR)
435437
endforeach()
436438

437439
# Process each app that is used on this system architecture
438-
set(APP_INSTALL_LIST)
439-
foreach(APP ${TGTSYS_${SYSVAR}_STATICAPPS})
440-
message(STATUS "Building Static App: ${APP}")
441-
add_subdirectory("${${APP}_MISSION_DIR}" apps/${APP})
442-
endforeach()
443-
444-
# Process each target that shares this system architecture
445-
# First Pass: Assemble the list of apps that should be compiled
446-
foreach(APP ${TGTSYS_${SYSVAR}_APPS})
440+
# First Pass: Assemble the list of apps that should be compiled
441+
foreach(APP ${TGTSYS_${SYSVAR}_APPS} ${TGTSYS_${SYSVAR}_STATICAPPS})
447442
set(TGTLIST_${APP})
448443
endforeach()
449444

450445
foreach(TGTNAME ${TGTSYS_${SYSVAR}})
451446

452447
# Append to the app install list for this CPU
453-
foreach(APP ${${TGTNAME}_APPLIST})
448+
foreach(APP ${${TGTNAME}_APPLIST} ${${TGTNAME}_STATIC_APPLIST})
454449
list(APPEND TGTLIST_${APP} ${TGTNAME})
455450
endforeach(APP ${${TGTNAME}_APPLIST})
456451

457452
endforeach(TGTNAME ${TGTSYS_${SYSVAR}})
458453

454+
foreach(APP ${TGTSYS_${SYSVAR}_STATICAPPS})
455+
set(APP_STATIC_TARGET_LIST ${TGTLIST_${APP}})
456+
message(STATUS "Building Static App: ${APP} targets=${APP_STATIC_TARGET_LIST}")
457+
add_subdirectory("${${APP}_MISSION_DIR}" apps/${APP})
458+
endforeach()
459+
unset(APP_STATIC_TARGET_LIST)
460+
459461
# Process each app that is used on this system architecture
460462
foreach(APP ${TGTSYS_${SYSVAR}_APPS})
461-
set(APP_INSTALL_LIST ${TGTLIST_${APP}})
462-
message(STATUS "Building App: ${APP} install=${APP_INSTALL_LIST}")
463+
set(APP_DYNAMIC_TARGET_LIST ${TGTLIST_${APP}})
464+
message(STATUS "Building Dynamic App: ${APP} targets=${APP_DYNAMIC_TARGET_LIST}")
463465
add_subdirectory("${${APP}_MISSION_DIR}" apps/${APP})
464466
endforeach()
467+
unset(APP_DYNAMIC_TARGET_LIST)
465468

466469
# Process each target that shares this system architecture
467470
# Second Pass: Build and link final target executable

‎cmake/sample_defs/sample_mission_cfg.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
#define CFE_MISSION_TIME_DEF_STCF_SECS 1000000
174174
#define CFE_MISSION_TIME_DEF_STCF_SUBS 0
175175

176-
#define CFE_MISSION_TIME_DEF_LEAPS 32
176+
#define CFE_MISSION_TIME_DEF_LEAPS 37
177177

178178
#define CFE_MISSION_TIME_DEF_DELAY_SECS 0
179179
#define CFE_MISSION_TIME_DEF_DELAY_SUBS 1000

‎fsw/cfe-core/src/es/cfe_es_apps.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ int32 CFE_ES_LoadModule(const CFE_ES_ModuleLoadParams_t* LoadParams, CFE_ES_Modu
370370
*/
371371
StatusCode = OS_ModuleLoad ( &ModuleId,
372372
LoadParams->Name,
373-
LoadParams->FileName );
373+
LoadParams->FileName,
374+
OS_MODULE_FLAG_GLOBAL_SYMBOLS );
374375

375376
if (StatusCode != OS_SUCCESS)
376377
{

‎fsw/cfe-core/src/inc/cfe_evs.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@
6060
#define OS_PRINTF(m,n)
6161
#endif
6262

63+
/*
64+
** Utility macros to make for simpler/more compact/readable code.
65+
*/
66+
#define CFE_EVS_Send(E,T,...) CFE_EVS_SendEvent((E), CFE_EVS_EventType_##T, __VA_ARGS__)
67+
#define CFE_EVS_SendDbg(E,...) CFE_EVS_Send(E, DEBUG, __VA_ARGS__)
68+
#define CFE_EVS_SendInfo(E,...) CFE_EVS_Send(E, INFORMATION, __VA_ARGS__)
69+
#define CFE_EVS_SendErr(E,...) CFE_EVS_Send(E, ERROR, __VA_ARGS__)
70+
#define CFE_EVS_SendCrit(E,...) CFE_EVS_Send(E, CRITICAL, __VA_ARGS__)
71+
6372
/** \name Common Event Filter Mask Values */
6473
/** \{ */
6574
#define CFE_EVS_NO_FILTER 0x0000 /**< \brief Stops any filtering. All messages are sent. */

‎fsw/cfe-core/src/inc/cfe_msg_api.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,19 @@
4444
* \brief Initialize a message
4545
*
4646
* \par Description
47-
* This routine initialize a message. If Clear is true the
48-
* message is cleard and constant header defaults are set.
49-
* The bits from MsgId and message size are always set.
47+
* This routine initialize a message. The entire message is
48+
* set to zero (based on size), defaults are set, then the
49+
* size and bits from MsgId are set.
5050
*
5151
* \param[in, out] MsgPtr A pointer to the buffer that contains the message.
5252
* \param[in] MsgId MsgId that corresponds to message
5353
* \param[in] Size Total size of the mesage (used to set length field)
54-
* \param[in] Clear Boolean to clear and set defaults
5554
*
5655
* \return Execution status, see \ref CFEReturnCodes
5756
* \retval #CFE_SUCCESS \copybrief CFE_SUCCESS
5857
* \retval #CFE_MSG_BAD_ARGUMENT \copybrief CFE_MSG_BAD_ARGUMENT
5958
*/
60-
CFE_Status_t CFE_MSG_Init(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId, CFE_MSG_Size_t Size, bool Clear);
59+
CFE_Status_t CFE_MSG_Init(CFE_MSG_Message_t *MsgPtr, CFE_SB_MsgId_t MsgId, CFE_MSG_Size_t Size);
6160

6261
/*****************************************************************************/
6362
/**

‎fsw/cfe-core/src/inc/cfe_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636

3737
/* Development Build Macro Definitions */
38-
#define CFE_BUILD_NUMBER 164 /*!< Development Build: Number of commits since baseline */
38+
#define CFE_BUILD_NUMBER 179 /*!< Development Build: Number of commits since baseline */
3939
#define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */
4040

4141
/* Version Macro Definitions */

‎fsw/cfe-core/src/sb/cfe_sb_util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void CFE_SB_InitMsg(void *MsgPtr,
5151
bool Clear )
5252
{
5353

54-
CFE_MSG_Init((CFE_MSG_Message_t *)MsgPtr, MsgId, Length, Clear);
54+
CFE_MSG_Init((CFE_MSG_Message_t *)MsgPtr, MsgId, Length);
5555

5656
} /* end CFE_SB_InitMsg */
5757

‎fsw/cfe-core/unit-test/es_UT.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ void TestApps(void)
14941494
UtAppRecPtr->StartParams.Priority = 255;
14951495
UtAppRecPtr->StartParams.StackSize = 8192;
14961496
UtAppRecPtr->StartParams.ExceptionAction = 0;
1497-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1497+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
14981498
UtAppRecPtr->ControlReq.AppControlRequest =
14991499
CFE_ES_RunStatus_APP_EXIT;
15001500
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
@@ -1511,7 +1511,7 @@ void TestApps(void)
15111511
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
15121512
UtAppRecPtr->ControlReq.AppControlRequest = CFE_ES_RunStatus_APP_EXIT;
15131513
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
1514-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1514+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15151515
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15161516
CFE_ES_ProcessControlRequest(Id);
15171517
UT_Report(__FILE__, __LINE__,
@@ -1527,7 +1527,7 @@ void TestApps(void)
15271527
UtAppRecPtr->ControlReq.AppControlRequest =
15281528
CFE_ES_RunStatus_SYS_DELETE;
15291529
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
1530-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1530+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15311531
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15321532
CFE_ES_ProcessControlRequest(Id);
15331533
UT_Report(__FILE__, __LINE__,
@@ -1543,7 +1543,7 @@ void TestApps(void)
15431543
UtAppRecPtr->ControlReq.AppControlRequest =
15441544
CFE_ES_RunStatus_SYS_RESTART;
15451545
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
1546-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1546+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15471547
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15481548
CFE_ES_ProcessControlRequest(Id);
15491549
UT_Report(__FILE__, __LINE__,
@@ -1558,7 +1558,7 @@ void TestApps(void)
15581558
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
15591559
UtAppRecPtr->ControlReq.AppControlRequest =
15601560
CFE_ES_RunStatus_SYS_RESTART;
1561-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1561+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15621562
UT_SetForceFail(UT_KEY(OS_TaskCreate), OS_ERROR);
15631563
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15641564
CFE_ES_ProcessControlRequest(Id);
@@ -1574,7 +1574,7 @@ void TestApps(void)
15741574
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
15751575
UtAppRecPtr->ControlReq.AppControlRequest =
15761576
CFE_ES_RunStatus_SYS_RELOAD;
1577-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1577+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15781578
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
15791579
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15801580
CFE_ES_ProcessControlRequest(Id);
@@ -1590,7 +1590,7 @@ void TestApps(void)
15901590
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
15911591
UtAppRecPtr->ControlReq.AppControlRequest =
15921592
CFE_ES_RunStatus_SYS_RELOAD;
1593-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1593+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
15941594
UT_SetForceFail(UT_KEY(OS_TaskCreate), OS_ERROR);
15951595
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
15961596
CFE_ES_ProcessControlRequest(Id);
@@ -1614,7 +1614,7 @@ void TestApps(void)
16141614
UtAppRecPtr->StartParams.Priority = 255;
16151615
UtAppRecPtr->StartParams.StackSize = 8192;
16161616
UtAppRecPtr->StartParams.ExceptionAction = 0;
1617-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1617+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
16181618
UtAppRecPtr->ControlReq.AppControlRequest =
16191619
CFE_ES_RunStatus_APP_ERROR;
16201620
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
@@ -1632,7 +1632,7 @@ void TestApps(void)
16321632
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
16331633
UtAppRecPtr->ControlReq.AppControlRequest =
16341634
CFE_ES_RunStatus_APP_ERROR;
1635-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1635+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
16361636
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
16371637
CFE_ES_ProcessControlRequest(Id);
16381638
UT_Report(__FILE__, __LINE__,
@@ -1655,7 +1655,7 @@ void TestApps(void)
16551655
UtAppRecPtr->StartParams.ExceptionAction = 0;
16561656
UtAppRecPtr->ControlReq.AppControlRequest =
16571657
CFE_ES_RunStatus_SYS_DELETE;
1658-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1658+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
16591659
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
16601660
CFE_ES_ProcessControlRequest(Id);
16611661
UT_Report(__FILE__, __LINE__,
@@ -1678,7 +1678,7 @@ void TestApps(void)
16781678
UtAppRecPtr->StartParams.ExceptionAction = 0;
16791679
UtAppRecPtr->ControlReq.AppControlRequest =
16801680
CFE_ES_RunStatus_SYS_RESTART;
1681-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1681+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
16821682
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
16831683
CFE_ES_ProcessControlRequest(Id);
16841684
UT_Report(__FILE__, __LINE__,
@@ -1701,7 +1701,7 @@ void TestApps(void)
17011701
UtAppRecPtr->StartParams.ExceptionAction = 0;
17021702
UtAppRecPtr->ControlReq.AppControlRequest =
17031703
CFE_ES_RunStatus_SYS_RELOAD;
1704-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1704+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
17051705
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
17061706
CFE_ES_ProcessControlRequest(Id);
17071707
UT_Report(__FILE__, __LINE__,
@@ -1726,7 +1726,7 @@ void TestApps(void)
17261726
UtAppRecPtr->StartParams.ExceptionAction = 0;
17271727
UtAppRecPtr->ControlReq.AppControlRequest =
17281728
CFE_ES_RunStatus_SYS_EXCEPTION;
1729-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1729+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
17301730
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
17311731
CFE_ES_ProcessControlRequest(Id);
17321732
UT_Report(__FILE__, __LINE__,
@@ -1795,7 +1795,7 @@ void TestApps(void)
17951795
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
17961796
ES_UT_SetupForOSCleanup();
17971797

1798-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1798+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
17991799
UT_SetForceFail(UT_KEY(OS_TaskDelete), OS_ERROR);
18001800
UT_SetForceFail(UT_KEY(OS_close), OS_ERROR);
18011801
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
@@ -1809,7 +1809,7 @@ void TestApps(void)
18091809
*/
18101810
ES_ResetUnitTest();
18111811
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
1812-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1812+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
18131813
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, NULL, NULL);
18141814
ES_UT_SetupForOSCleanup();
18151815
UT_SetDeferredRetcode(UT_KEY(OS_MutSemDelete), 1, OS_ERROR);
@@ -1824,7 +1824,7 @@ void TestApps(void)
18241824
*/
18251825
ES_ResetUnitTest();
18261826
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
1827-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1827+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
18281828
UT_SetDeferredRetcode(UT_KEY(OS_ModuleUnload), 1, OS_ERROR);
18291829
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
18301830
UT_Report(__FILE__, __LINE__,
@@ -1837,7 +1837,7 @@ void TestApps(void)
18371837
*/
18381838
ES_ResetUnitTest();
18391839
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
1840-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
1840+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
18411841
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_CleanUpApp), 1, -1);
18421842
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
18431843
UT_Report(__FILE__, __LINE__,
@@ -2009,12 +2009,12 @@ void TestApps(void)
20092009
ES_ResetUnitTest();
20102010
/* Setup an entry which will be deleted */
20112011
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
2012-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
2012+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
20132013
/* Setup a second entry which will NOT be deleted */
20142014
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, NULL, &UtTaskRecPtr);
20152015
ES_UT_SetupMemPoolId(&UtPoolRecPtr);
20162016
UtPoolRecPtr->OwnerAppID = CFE_ES_AppRecordGetID(UtAppRecPtr);
2017-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
2017+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
20182018
/* Associate a child task with the app to be deleted */
20192019
ES_UT_SetupChildTaskId(UtAppRecPtr, NULL, NULL);
20202020
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
@@ -2037,7 +2037,7 @@ void TestApps(void)
20372037
ES_ResetUnitTest();
20382038
/* Setup an entry which will be deleted */
20392039
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
2040-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
2040+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
20412041
ES_UT_SetupMemPoolId(&UtPoolRecPtr);
20422042
UtPoolRecPtr->OwnerAppID = CFE_ES_AppRecordGetID(UtAppRecPtr);
20432043
UtPoolRecPtr->PoolID = CFE_ES_ResourceID_FromInteger(99999); /* Mismatch */
@@ -2058,10 +2058,10 @@ void TestApps(void)
20582058

20592059
/* Setup an entry which will be deleted */
20602060
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, NULL);
2061-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
2061+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
20622062
/* Setup a second entry which will NOT be deleted */
20632063
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, NULL, &UtTaskRecPtr);
2064-
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL);
2064+
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, NULL, NULL, 0);
20652065
/* Associate a child task with the app to be deleted */
20662066
ES_UT_SetupChildTaskId(UtAppRecPtr, NULL, NULL);
20672067

@@ -2118,7 +2118,7 @@ void TestApps(void)
21182118
ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, NULL, &UtAppRecPtr, &UtTaskRecPtr);
21192119

21202120
OS_ModuleLoad(&UtAppRecPtr->ModuleInfo.ModuleId, "UT",
2121-
"ut-module");
2121+
"ut-module", 0);
21222122
Id = CFE_ES_AppRecordGetID(UtAppRecPtr);
21232123
UT_Report(__FILE__, __LINE__,
21242124
CFE_ES_CleanUpApp(Id) == CFE_SUCCESS &&

‎fsw/cfe-core/ut-stubs/ut_es_stubs.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
*/
3535
#include <string.h>
3636
#include "cfe.h"
37+
#include "private/cfe_private.h"
3738
#include "utstubs.h"
3839
#include "utassert.h"
3940

@@ -970,7 +971,7 @@ int32 CFE_ES_RestoreFromCDS(void *RestoreToMemory, CFE_ES_CDSHandle_t Handle)
970971
**
971972
******************************************************************************/
972973
int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr,
973-
int32 BlockSize,
974+
CFE_ES_CDS_Offset_t UserBlockSize,
974975
const char *Name,
975976
bool CriticalTbl)
976977
{

0 commit comments

Comments
 (0)