CCB 20191023/30: Merge #362 #375 #376 #382

Fixes #361, #373, #374, #381 Code reviewed and approved at 20191023 and 30 CCBs
nasa · Oct 31, 2019 · e9f7382 · e9f7382
2 parents c3f799a + d93fd2a
commit e9f7382
Show file tree

Hide file tree

Showing 23 changed files with 3,479 additions and 11 deletions.
diff --git a/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake b/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake
@@ -0,0 +1,51 @@
+# This example toolchain file describes the cross compiler to use for
+# the target architecture indicated in the configuration file.
+
+# Basic cross system configuration
+set(CMAKE_SYSTEM_NAME VxWorks-CFE)
+set(CMAKE_SYSTEM_PROCESSOR ppc)
+set(CMAKE_SYSTEM_VERSION 6.9)
+set(VXWORKS_GCC_VERSION 4.3.3)
+set(VXWORKS_HOST_VERSION x86-linux2)
+set(WIND_HOME_DFL "$ENV{WIND_HOME}")
+if(NOT WIND_HOME_DFL)
+  set(WIND_HOME_DFL "/opt/WindRiver")
+endif(NOT WIND_HOME_DFL)
+set(WIND_HOME "${WIND_HOME_DFL}" CACHE PATH "Wind River installation directory")
+set(VXWORKS_TOOLS_PREFIX "${WIND_HOME}/gnu/${VXWORKS_GCC_VERSION}-vxworks-${CMAKE_SYSTEM_VERSION}/${VXWORKS_HOST_VERSION}")
+
+
+# specify the cross compiler - adjust accord to compiler installation
+# This uses the compiler-wrapper toolchain that buildroot produces
+SET(SDKHOSTBINDIR               "${VXWORKS_TOOLS_PREFIX}/bin")
+set(TARGETSUFFIX                "${CMAKE_SYSTEM_PROCESSOR}")
+#set(VXWORKS_BSP_C_FLAGS           "-march=i686 -mtune=i686 -fno-common")
+#set(VXWORKS_BSP_CXX_FLAGS         ${VXWORKS_BSP_C_FLAGS})
+
+SET(CMAKE_C_COMPILER            "${SDKHOSTBINDIR}/cc${TARGETSUFFIX}")
+SET(CMAKE_CXX_COMPILER          "${SDKHOSTBINDIR}/c++${TARGETSUFFIX}")
+SET(CMAKE_LINKER                "${SDKHOSTBINDIR}/ld${TARGETSUFFIX}")
+SET(CMAKE_ASM_COMPILER          "${SDKHOSTBINDIR}/as${TARGETSUFFIX}")
+SET(CMAKE_AR                    "${SDKHOSTBINDIR}/ar${TARGETSUFFIX}")
+SET(CMAKE_OBJDUMP               "${SDKHOSTBINDIR}/objdump${TARGETSUFFIX}")
+SET(CMAKE_RANLIB                "${SDKHOSTBINDIR}/ranlib${TARGETSUFFIX}")
+
+# Note that CEXP is not a shared library loader - it will not support code compiled with -fPIC
+# Also exception handling is very iffy.  These two options disable eh_frame creation.
+#set(CMAKE_C_COMPILE_OPTIONS_PIC -fno-exceptions -fno-asynchronous-unwind-tables)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM   NEVER)
+
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY   ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   ONLY)
+
+SET(CMAKE_PREFIX_PATH                   /)
+
+# these settings are specific to cFE/OSAL and determines which
+# abstraction layers are built when using this toolchain
+SET(CFE_SYSTEM_PSPNAME                  mcp750-vxworks)
+SET(OSAL_SYSTEM_BSPTYPE                 genppc-vxworks6.4)
+SET(OSAL_SYSTEM_OSTYPE                  vxworks)
+
diff --git a/docs/cFE Application Developers Guide.doc b/docs/cFE Application Developers Guide.doc
diff --git a/docs/cFE Application Developers Guide.md b/docs/cFE Application Developers Guide.md
diff --git a/docs/media/cFE_Application_Developers_Guide_image10.png b/docs/media/cFE_Application_Developers_Guide_image10.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image11.png b/docs/media/cFE_Application_Developers_Guide_image11.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image12.png b/docs/media/cFE_Application_Developers_Guide_image12.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image13.png b/docs/media/cFE_Application_Developers_Guide_image13.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image15.png b/docs/media/cFE_Application_Developers_Guide_image15.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image16.png b/docs/media/cFE_Application_Developers_Guide_image16.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image17.png b/docs/media/cFE_Application_Developers_Guide_image17.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image18.png b/docs/media/cFE_Application_Developers_Guide_image18.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image19.png b/docs/media/cFE_Application_Developers_Guide_image19.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image20.png b/docs/media/cFE_Application_Developers_Guide_image20.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image3.png b/docs/media/cFE_Application_Developers_Guide_image3.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image4.png b/docs/media/cFE_Application_Developers_Guide_image4.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image5.png b/docs/media/cFE_Application_Developers_Guide_image5.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image6.png b/docs/media/cFE_Application_Developers_Guide_image6.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image7.png b/docs/media/cFE_Application_Developers_Guide_image7.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image8.png b/docs/media/cFE_Application_Developers_Guide_image8.png
diff --git a/docs/media/cFE_Application_Developers_Guide_image9.png b/docs/media/cFE_Application_Developers_Guide_image9.png
diff --git a/fsw/cfe-core/src/es/cfe_es_shell.c b/fsw/cfe-core/src/es/cfe_es_shell.c
@@ -306,7 +306,7 @@ int32 CFE_ES_ListTasks(int32 fd)
                 /*
                 ** Populate the AppInfo entry 
                 */
-                Result = CFE_ES_GetTaskInfo(&TaskInfo,i);
+                Result = CFE_ES_GetTaskInfo(&TaskInfo,CFE_ES_Global.TaskTable[i].TaskId);
 
                 if ( Result == CFE_SUCCESS )
                 {

diff --git a/fsw/cfe-core/src/evs/cfe_evs_log.c b/fsw/cfe-core/src/evs/cfe_evs_log.c
@@ -167,9 +167,6 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFile_t *data)
     }
     else
     {
-        /* Serialize access to event log control variables */
-        OS_MutSemTake(CFE_EVS_GlobalData.EVS_SharedDataMutexID);
-
         /* Copy the commanded filename into local buffer to ensure size limitation and to allow for modification */
         CFE_SB_MessageStringGet(LogFilename, (const char *)CmdPtr->LogFilename, CFE_PLATFORM_EVS_DEFAULT_LOG_FILE,
                 OS_MAX_PATH_LEN, sizeof(CmdPtr->LogFilename));
@@ -198,6 +195,9 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFile_t *data)
 
             if (BytesWritten == sizeof(LogFileHdr))
             {
+                /* Serialize access to event log control variables */
+                OS_MutSemTake(CFE_EVS_GlobalData.EVS_SharedDataMutexID);
+
                 /* Is the log full? -- Doesn't matter if wrap mode is enabled */
                 if (CFE_EVS_GlobalData.EVS_LogPtr->LogCount == CFE_PLATFORM_EVS_LOG_MAX)
                 {
@@ -228,13 +228,12 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFile_t *data)
                     }
                     else
                     {
-                        EVS_SendEvent(CFE_EVS_ERR_WRLOGFILE_EID, CFE_EVS_EventType_ERROR,
-                                "Write Log File Command Error: OS_write = 0x%08X, filename = %s",
-                                (unsigned int)BytesWritten, LogFilename);
                         break;
                     }
                 }
 
+                OS_MutSemGive(CFE_EVS_GlobalData.EVS_SharedDataMutexID);
+
                 /* Process command handler success result */
                 if (i == CFE_EVS_GlobalData.EVS_LogPtr->LogCount)
                 {
@@ -243,13 +242,17 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFile_t *data)
                             (int)CFE_EVS_GlobalData.EVS_LogPtr->LogCount, LogFilename);
                     Result = CFE_SUCCESS;
                 }
+                else
+                {
+                    EVS_SendEvent(CFE_EVS_ERR_WRLOGFILE_EID, CFE_EVS_EventType_ERROR,
+                            "Write Log File Command Error: OS_write = 0x%08X, filename = %s",
+                            (unsigned int)BytesWritten, LogFilename);
+                }
             }
 
             OS_close(LogFileHandle);
         }
 
-        OS_MutSemGive(CFE_EVS_GlobalData.EVS_SharedDataMutexID);
-
     }
 
     return(Result);

diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c
@@ -390,8 +390,16 @@ int32 CFE_SB_DeletePipeFull(CFE_SB_PipeId_t PipeId,uint32 AppId)
 
     CFE_SB_UnlockSharedData(__func__,__LINE__);
 
+    /*
+     * Get the app name of the actual pipe owner for the event string
+     * as this may be different than the task doing the deletion.
+     *
+     * Note: If this fails (e.g. bad AppID, it returns an empty string
+     */
+    CFE_ES_GetAppName(FullName, Owner, sizeof(FullName));
+
     CFE_EVS_SendEventWithAppID(CFE_SB_PIPE_DELETED_EID,CFE_EVS_EventType_DEBUG,CFE_SB.AppId,
-          "Pipe Deleted:id %d,owner %s",(int)PipeId, CFE_SB_GetAppTskName(Owner,FullName));
+          "Pipe Deleted:id %d,owner %s",(int)PipeId, FullName);
 
     return CFE_SUCCESS;
 
@@ -460,8 +468,17 @@ int32 CFE_SB_SetPipeOpts(CFE_SB_PipeId_t PipeId, uint8 Opts)
     CFE_SB.PipeTbl[PipeTblIdx].Opts = Opts;
 
     CFE_SB_UnlockSharedData(__func__,__LINE__);
+
+    /*
+     * Get the app name of the actual pipe owner for the event string
+     * as this may be different than the task doing the deletion.
+     *
+     * Note: If this fails (e.g. bad AppID, it returns an empty string
+     */
+    CFE_ES_GetAppName(FullName, Owner, sizeof(FullName));
+
     CFE_EVS_SendEventWithAppID(CFE_SB_SETPIPEOPTS_EID,CFE_EVS_EventType_DEBUG,CFE_SB.AppId,
-          "Pipe opts set:id %d,owner %s, opts=0x%02x",(int)PipeId, CFE_SB_GetAppTskName(Owner,FullName), (unsigned int)Opts);
+          "Pipe opts set:id %d,owner %s, opts=0x%02x",(int)PipeId, FullName, (unsigned int)Opts);
 
     return CFE_SUCCESS;
 }/* end CFE_SB_SetPipeOpts */