Merge pull request nasa#1017 from jphickey/fix-965-osal-ids-tlm

Fix nasa#965, remove OSAL ID from App/LibInfo struct
jphickey · Dec 1, 2020 · c4950a6 · c4950a6
2 parents 1f7a716 + 720525e
commit c4950a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -970,6 +970,7 @@ int32 CFE_ES_GetAppInfo(CFE_ES_AppInfo_t *AppInfo, CFE_ES_ResourceID_t AppId)
    CFE_ES_AppRecord_t *AppRecPtr;
    CFE_ES_TaskRecord_t *TaskRecPtr;
    int32              Status;
+   osal_id_t          ModuleId;
    uint32             i;
 
    if ( AppInfo == NULL )
@@ -979,6 +980,7 @@ int32 CFE_ES_GetAppInfo(CFE_ES_AppInfo_t *AppInfo, CFE_ES_ResourceID_t AppId)
    }
 
    memset(AppInfo, 0, sizeof(*AppInfo));
+   ModuleId = OS_OBJECT_ID_UNDEFINED;
 
    AppRecPtr = CFE_ES_LocateAppRecordByID(AppId);
 
@@ -1007,6 +1009,8 @@ int32 CFE_ES_GetAppInfo(CFE_ES_AppInfo_t *AppInfo, CFE_ES_ResourceID_t AppId)
        AppInfo->Priority = AppRecPtr->StartParams.Priority;
        AppInfo->MainTaskId = AppRecPtr->MainTaskId;
 
+       ModuleId = AppRecPtr->ModuleInfo.ModuleId;
+
        /*
        ** Calculate the number of child tasks
        */
@@ -1044,7 +1048,7 @@ int32 CFE_ES_GetAppInfo(CFE_ES_AppInfo_t *AppInfo, CFE_ES_ResourceID_t AppId)
    */
    if (Status == CFE_SUCCESS)
    {
-       CFE_ES_CopyModuleAddressInfo(AppInfo->ModuleId, AppInfo);
+       CFE_ES_CopyModuleAddressInfo(ModuleId, AppInfo);
    }
 
    return Status;
@@ -1057,13 +1061,17 @@ int32 CFE_ES_GetLibInfo(CFE_ES_AppInfo_t *LibInfo, CFE_ES_ResourceID_t LibId)
 {
     int32              Status;
     CFE_ES_LibRecord_t *LibRecPtr;
+    osal_id_t          ModuleId;
 
     if ( LibInfo == NULL )
     {
        CFE_ES_WriteToSysLog("CFE_ES_GetLibInfo: Invalid Parameter ( Null Pointer )\n");
        return CFE_ES_ERR_BUFFER;
     }
 
+    memset(LibInfo, 0, sizeof(*LibInfo));
+    ModuleId = OS_OBJECT_ID_UNDEFINED;
+
     LibRecPtr = CFE_ES_LocateLibRecordByID(LibId);
 
     CFE_ES_LockSharedData(__func__,__LINE__);
@@ -1086,6 +1094,8 @@ int32 CFE_ES_GetLibInfo(CFE_ES_AppInfo_t *LibInfo, CFE_ES_ResourceID_t LibId)
         CFE_ES_CopyModuleBasicInfo(&LibRecPtr->BasicInfo, LibInfo);
         CFE_ES_CopyModuleStatusInfo(&LibRecPtr->ModuleInfo, LibInfo);
 
+        ModuleId = LibRecPtr->ModuleInfo.ModuleId;
+
         Status = CFE_SUCCESS;
     }
 
@@ -1096,7 +1106,7 @@ int32 CFE_ES_GetLibInfo(CFE_ES_AppInfo_t *LibInfo, CFE_ES_ResourceID_t LibId)
      */
     if (Status == CFE_SUCCESS)
     {
-        CFE_ES_CopyModuleAddressInfo(LibInfo->ModuleId, LibInfo);
+        CFE_ES_CopyModuleAddressInfo(ModuleId, LibInfo);
     }
 
     return Status;

diff --git a/fsw/cfe-core/src/es/cfe_es_apps.c b/fsw/cfe-core/src/es/cfe_es_apps.c
@@ -1766,7 +1766,6 @@ void CFE_ES_CopyModuleBasicInfo(const CFE_ES_ModuleLoadParams_t *ParamsPtr, CFE_
 */
 void CFE_ES_CopyModuleStatusInfo(const CFE_ES_ModuleLoadStatus_t *StatusPtr, CFE_ES_AppInfo_t *AppInfoPtr)
 {
-    AppInfoPtr->ModuleId = StatusPtr->ModuleId;
     AppInfoPtr->StartAddress = CFE_ES_MEMADDRESS_C(StatusPtr->EntryAddress);
 }
 

diff --git a/fsw/cfe-core/src/inc/cfe_es_msg.h b/fsw/cfe-core/src/inc/cfe_es_msg.h
@@ -1406,8 +1406,6 @@ typedef struct CFE_ES_AppInfo
 
    CFE_ES_MemOffset_t   StackSize;             /**< \cfetlmmnemonic \ES_STACKSIZE
                                                     \brief The Stack Size of the Application */
-   osal_id_t   ModuleId;                       /**< \cfetlmmnemonic \ES_MODULEID
-                                                    \brief The ID of the Loadable Module for the Application */
    uint32   AddressesAreValid;                 /**< \cfetlmmnemonic \ES_ADDRVALID
                                                     \brief Indicates that the Code, Data, and BSS addresses/sizes are valid */
    CFE_ES_MemAddress_t CodeAddress;            /**< \cfetlmmnemonic \ES_CODEADDR