Merge branch 'integration-candidate' into fix559-fixdocwarnings

nasa · May 8, 2020 · 894e6e0 · 894e6e0
2 parents 7df54d6 + 4c392cc
commit 894e6e0
Show file tree

Hide file tree

Showing 60 changed files with 1,839 additions and 2,181 deletions.
diff --git a/README.md b/README.md
@@ -6,64 +6,114 @@ This repository contains NASA's Core Flight Executive (cFE), which is a framewor
 
 This is a collection of services and associated framework to be located in the `cfe` subdirectory of a cFS Mission Tree.  The Core Flight System is bundled at https://github.com/nasa/cFS, which includes build and execution instructions.
 
-## Version Notes
-- 6.7.13: DEVELOPMENT
-  - RTEMS builds without error.
-  - Use the INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES properties from the osal target and apply them to the entire CFE build as a directory-scope property. No impact until these are set in OSAL.
-  - Minor other updates (see https://github.com/nasa/cFE/pull/615)
-- 6.7.12: DEVELOPMENT
-  - Cmd code (and checksum) are always in the same place (matches GSFC spec for command secondary header)
-  - No impact to behavior. Previously the perf log dump file frequently contained errors due to out of order or otherwise corrupted entries, which is now fixed.
-  - Minor other updates (see https://github.com/nasa/cFE/pull/586)
-- 6.7.11: DEVELOPMENT
-  - Improve documentation
-  - Update makefile to report branch coverage
-  - Minor other updates (see https://github.com/nasa/cFE/pull/566)
-- 6.7.10: DEVELOPMENT
-  - Fix potential unit test problems with name collisions
-  - Improve documentation
-  - Minor other updates (see https://github.com/nasa/cFE/pull/563)
-- 6.7.9: DEVELOPMENT
-  - No longer requires sed "hack" to change the setting in default_config.h  
-  - Minor other updates (see https://github.com/nasa/cFE/pull/544)
-- 6.7.8: DEVELOPMENT
-  - Updates and cleaned up documentation and requirements
-  - Fixes incorrect debug messages
-  - Decrease child task count when one is deleted
-  - Minor other updates (see https://github.com/nasa/cFE/pull/530)
-- 6.7.7: DEVELOPMENT
-  - Adds a new function, CFE_SB_GetPipeIdByName, which retrieves the pipe ID given a name of a pipe.
-  - Improvement in error reporting when using a pipe name that is already in use, or when the queue limit has been reached.
-  - Added userguide and osalguide to the local target list to avoid makefile warning
-  - Minor other updates (see https://github.com/nasa/cFE/pull/511)
-- 6.7.6: DEVELOPMENT
-  - Adds OMIT_DEPRECATED prep flag
-  - Adds and enforces strict warnings
-  - Software Bus now increments sequence counter even if there are no subscribers
-  - Warning, comment, and code coverage cleanup (see https://github.com/nasa/cFE/pull/490)
-- 6.7.5: DEVELOPMENT
-  - Added CI static analysis check
-  - Resolved static analysis warnings
-  - Minor other updates (see https://github.com/nasa/cFE/pull/479)
-- 6.7.4: DEVELOPMENT
-  - Minor updates (see https://github.com/nasa/cFE/pull/448)
-- 6.7.3: DEVELOPMENT
-  - Minor updates (see https://github.com/nasa/cFE/pull/413)
-- 6.7.2: DEVELOPMENT
-  - Minor bugs and enhancements (see https://github.com/nasa/cFE/pull/388)
-- 6.7.1: DEVELOPMENT
-  - Minor bug fixes (see https://github.com/nasa/cFE/pull/378)
-  - Fix strlen in CFE_ES_TaskInit https://github.com/nasa/cFE/pull/23
-- **6.7.0 OFFICIAL RELEASE**:
-  - This is a point release from an internal repository
-  - Changes are detailed in [cFS repo](https://github.com/nasa/cFS) release documentation
-  - Apache 2.0
-- **6.6.0a OFFICIAL RELEASE**:
-  - This is a point release from an internal repository
-  - Apache 2.0
-  - Additional release notes are found in [release notes](https://github.com/nasa/cFE/blob/v6.6.0a/docs/cFE_release_notes.md)
-  - See the [version description document](https://github.com/nasa/cFE/blob/v6.6.0a/docs/cFE_6_6_0_version_description.pdf) for the full document
-  - Test results can be found in [test results](https://github.com/nasa/cFE/tree/v6.6.0a/test-and-ground/test-review-packages/Results)
+## Version History
+
+#### Development Build: 6.7.16
+
+- Users must now select OSAL options via the CMake file in their defs directory, rather than the osconfig.h file.
+- See https://github.com/nasa/cFE/pull/672 for more details
+
+#### Development Build: 6.7.15
+
+- Upon power on reset, default system log mode set to overwrite. Upon processor reset, default system log mode set to discard.
+- No longer locks while locked (no issue observed on linux/posix, but user reported issue on FreeRTOS 10)
+- Internal `CFE_TBL_LoadFromFile()` API changed slightly to add AppName as a parameter. Return value from `LoadFromFile()` no longer relevant for event generation.
+- Updates `CFE_TBL_CleanUpApp` such that it now checks the 'used flag' prior to calling `CFE_TBL_RemoveAccessLink` for a given TblHandle. Also sets the AppId to `CFE_TBL_NOT_OWNED` after removing the access descriptor link from linked list.
+- Removed `OS_FS_SUCCESS, OS_FS_ERROR , OS_FS_ERR_INVALID_POINTER, OS_FS_ERR_NO_FREE_FDS , OS_FS_ERR_INVALID_FD, and OS_FS_UNIMPLEMENTED` from `osapi-os-filesys.h`
+- See https://github.com/nasa/cFE/pull/649 for more details
+
+#### Development Build: 6.7.14
+
+- Exposes the `CFE_SB_IsValidMsgId()` for application usage.
+- `CFE_SB_GetLastSenderID` will now detect if it is being called prior to a message being sent on a given pipe.
+- Mismatches between PSP/BSP/OS are now detected and warned about during make prep. Only the `CFE_SYSTEM_PSPNAME` is actually required to be specified for a CFE build now. Others can be omitted.
+- See https://github.com/nasa/cFE/pull/635 for more details
+
+#### Development Build: 6.7.13
+
+- RTEMS builds without error.
+- Use the INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES properties from the osal target and apply them to the entire CFE build as a directory-scope property. No impact until these are set in OSAL.
+- Minor other updates (see https://github.com/nasa/cFE/pull/615)
+
+#### Development Build: 6.7.12
+
+- Cmd code (and checksum) are always in the same place (matches GSFC spec for command secondary header)
+- No impact to behavior. Previously the perf log dump file frequently contained errors due to out of order or otherwise corrupted entries, which is now fixed.
+- Minor other updates (see https://github.com/nasa/cFE/pull/586)
+
+#### Development Build: 6.7.11
+
+- Improve documentation
+- Update makefile to report branch coverage
+- Minor other updates (see https://github.com/nasa/cFE/pull/566)
+
+#### Development Build: 6.7.10
+
+- Fix potential unit test problems with name collisions
+- Improve documentation
+- Minor other updates (see https://github.com/nasa/cFE/pull/563)
+
+#### Development Build: 6.7.9
+
+- No longer requires sed "hack" to change the setting in default_config.h  
+- Minor other updates (see https://github.com/nasa/cFE/pull/544)
+
+#### Development Build: 6.7.8
+- Updates and cleaned up documentation and requirements
+- Fixes incorrect debug messages
+- Decrease child task count when one is deleted
+- Minor other updates (see https://github.com/nasa/cFE/pull/530)
+
+#### Development Build: 6.7.7
+
+- Adds a new function, CFE_SB_GetPipeIdByName, which retrieves the pipe ID given a name of a pipe.
+- Improvement in error reporting when using a pipe name that is already in use, or when the queue limit has been reached.
+- Added userguide and osalguide to the local target list to avoid makefile warning
+- Minor other updates (see https://github.com/nasa/cFE/pull/511)
+
+#### Development Build: 6.7.6
+
+- Adds OMIT_DEPRECATED prep flag
+- Adds and enforces strict warnings
+- Software Bus now increments sequence counter even if there are no subscribers
+- Warning, comment, and code coverage cleanup (see https://github.com/nasa/cFE/pull/490)
+
+#### Development Build: 6.7.5
+
+- Added CI static analysis check
+- Resolved static analysis warnings
+- Minor other updates (see https://github.com/nasa/cFE/pull/479)
+
+#### Development Build: 6.7.4
+
+- Minor updates (see https://github.com/nasa/cFE/pull/448)
+
+#### Development Build: 6.7.3
+
+- Minor updates (see https://github.com/nasa/cFE/pull/413)
+
+#### Development Build: 6.7.2
+
+- Minor bugs and enhancements (see https://github.com/nasa/cFE/pull/388)
+
+#### Development Build: 6.7.1
+
+- Fix strlen in CFE_ES_TaskInit https://github.com/nasa/cFE/pull/23
+- Minor bug fixes (see https://github.com/nasa/cFE/pull/378)
+
+### ***OFFICIAL RELEASE: 6.7.0***
+
+- This is a point release from an internal repository
+- Changes are detailed in [cFS repo](https://github.com/nasa/cFS) release documentation
+- Apache 2.0
+
+### ***OFFICIAL RELEASE: 6.6.0a***
+
+- This is a point release from an internal repository
+- Apache 2.0
+- Additional release notes are found in [release notes](https://github.com/nasa/cFE/blob/v6.6.0a/docs/cFE_release_notes.md)
+- See the [version description document](https://github.com/nasa/cFE/blob/v6.6.0a/docs/cFE_6_6_0_version_description.pdf) for the full document
+- Test results can be found in [test results](https://github.com/nasa/cFE/tree/v6.6.0a/test-and-ground/test-review-packages/Results)
 
 ## Known issues
 

diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
@@ -259,12 +259,18 @@ endfunction(cfs_app_do_install)
 #
 function(prepare)
 
-  # Generate the "osconfig.h" wrapper file as indicated by the configuration
-  # If specific system config options were not specified, use defaults
-  if (NOT OSAL_SYSTEM_OSCONFIG)
-    set(OSAL_SYSTEM_OSCONFIG default)
-  endif (NOT OSAL_SYSTEM_OSCONFIG)    
-  generate_config_includefile("inc/osconfig.h" osconfig.h ${OSAL_SYSTEM_OSCONFIG} ${TARGETSYSTEM})
+  # Choose the configuration file to use for OSAL on this system
+  set(OSAL_CONFIGURATION_FILE)
+  if (EXISTS "${MISSION_DEFS}/default_osconfig.cmake")
+    list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/default_osconfig.cmake")
+  endif()
+  if (DEFINED OSAL_SYSTEM_OSCONFIG AND EXISTS "${MISSION_DEFS}/${OSAL_SYSTEM_OSCONFIG}_osconfig.cmake")
+    list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/${OSAL_SYSTEM_OSCONFIG}_osconfig.cmake")
+  endif()
+  if (EXISTS "${MISSION_DEFS}/${TARGETSYSTEM}_osconfig.cmake")
+    list(APPEND OSAL_CONFIGURATION_FILE "${MISSION_DEFS}/${TARGETSYSTEM}_osconfig.cmake")
+  endif()
+  set(OSAL_CONFIGURATION_FILE ${OSAL_CONFIGURATION_FILE} PARENT_SCOPE)
 
   # Allow sources to "ifdef" certain things if running on simulated hardware
   # This should be used sparingly, typically to fake access to hardware that is not present
@@ -358,7 +364,7 @@ function(process_arch SYSVAR)
   get_target_property(OSAL_INCLUDE_DIRECTORIES osal INTERFACE_INCLUDE_DIRECTORIES)
 
   if (OSAL_COMPILE_DEFINITIONS)
-    set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${OSAL_COMPILE_DEFINITIONS}")
+    set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${OSAL_COMPILE_DEFINITIONS}")
   endif (OSAL_COMPILE_DEFINITIONS)
   if (OSAL_INCLUDE_DIRECTORIES)
     include_directories(${OSAL_INCLUDE_DIRECTORIES})
@@ -372,11 +378,13 @@ function(process_arch SYSVAR)
   file(APPEND "${MISSION_BINARY_DIR}/doc/mission-content.doxyfile" 
     "PREDEFINED += ${DOXYGEN_DEFINED_MACROS}\n"
     "INPUT += ${MISSION_SOURCE_DIR}/osal/src/os/${OSAL_SYSTEM_OSTYPE}\n"
-    "INPUT += ${MISSION_SOURCE_DIR}/psp/fsw/${CFE_SYSTEM_PSPNAME}\n")
+    "INPUT += ${MISSION_SOURCE_DIR}/psp/fsw/${CFE_SYSTEM_PSPNAME}\n"
+    "INPUT += ${CMAKE_BINARY_DIR}/inc")
 
   # Append to usersguide.doxyfile
   file(APPEND "${MISSION_BINARY_DIR}/doc/cfe-usersguide.doxyfile" 
-    "INPUT += ${MISSION_SOURCE_DIR}/psp/fsw/${CFE_SYSTEM_PSPNAME}/src\n")
+    "INPUT += ${MISSION_SOURCE_DIR}/psp/fsw/${CFE_SYSTEM_PSPNAME}/src\n"
+    "INPUT += ${CMAKE_BINARY_DIR}/inc")
 
   # The PSP and/or OSAL should have defined where to install the binaries.
   # If not, just install them in /cf as a default (this can be modified 

diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
@@ -219,17 +219,25 @@ function(prepare)
 
   configure_file("${CFE_SOURCE_DIR}/cmake/mission-detaildesign.doxyfile.in"
     "${CMAKE_BINARY_DIR}/doc/mission-detaildesign.doxyfile")
+
+  # Generate an "empty" osconfig.h file for doxygen purposes
+  # this does not have the actual user-defined values, but will
+  # have the documentation associated with each macro definition.
+  configure_file("${osal_MISSION_DIR}/osconfig.h.in"
+    "${CMAKE_BINARY_DIR}/doc/osconfig-example.h")
 
   # The user guide should include the doxygen from the _public_ API files from CFE + OSAL
   file(GLOB MISSION_USERGUIDE_HEADERFILES 
     "${cfe-core_MISSION_DIR}/src/inc/*.h"
     "${osal_MISSION_DIR}/src/os/inc/*.h"
+    "${CMAKE_BINARY_DIR}/doc/osconfig-example.h"
     "${MISSION_SOURCE_DIR}/psp/fsw/inc/*.h")
   string(REPLACE ";" " \\\n" MISSION_USERGUIDE_HEADERFILES "${MISSION_USERGUIDE_HEADERFILES}") 
 
   # OSAL API GUIDE include PUBLIC API
   file(GLOB MISSION_OSAL_HEADERFILES 
-    "${osal_MISSION_DIR}/src/os/inc/*.h")
+    "${osal_MISSION_DIR}/src/os/inc/*.h"
+    "${CMAKE_BINARY_DIR}/doc/osconfig-example.h")
   string(REPLACE ";" " \\\n" MISSION_OSAL_HEADERFILES "${MISSION_OSAL_HEADERFILES}") 
 
   configure_file("${CFE_SOURCE_DIR}/cmake/cfe-usersguide.doxyfile.in"

diff --git a/cmake/sample_defs/cpu1_msgids.h b/cmake/sample_defs/cpu1_msgids.h
@@ -58,6 +58,8 @@
 #define CFE_TBL_SEND_HK_MID     CFE_MISSION_CMD_MID_BASE1 + CFE_MISSION_TBL_SEND_HK_MSG     /* 0x180C */
 #define CFE_TIME_SEND_HK_MID    CFE_MISSION_CMD_MID_BASE1 + CFE_MISSION_TIME_SEND_HK_MSG    /* 0x180D */
 
+#define CFE_SB_SUB_RPT_CTRL_MID CFE_MISSION_CMD_MID_BASE1 + CFE_MISSION_SB_SUB_RPT_CTRL_MSG /* 0x180E */
+
 #define CFE_TIME_TONE_CMD_MID   CFE_MISSION_CMD_MID_BASE1 + CFE_MISSION_TIME_TONE_CMD_MSG   /* 0x1810 */
 #define CFE_TIME_1HZ_CMD_MID    CFE_MISSION_CMD_MID_BASE1 + CFE_MISSION_TIME_1HZ_CMD_MSG    /* 0x1811 */
 
@@ -86,7 +88,11 @@
 #define CFE_TBL_REG_TLM_MID         CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_TBL_REG_TLM_MSG     /* 0x080C */
 #define CFE_SB_ALLSUBS_TLM_MID      CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_SB_ALLSUBS_TLM_MSG  /* 0x080D */
 #define CFE_SB_ONESUB_TLM_MID       CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_SB_ONESUB_TLM_MSG   /* 0x080E */
-#define CFE_ES_SHELL_TLM_MID        CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_SHELL_TLM_MSG    /* 0x080F */
+
+#ifndef CFE_OMIT_DEPRECATED_6_7
+  #define CFE_ES_SHELL_TLM_MID        CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_SHELL_TLM_MSG    /* 0x080F */
+#endif
+
 #define CFE_ES_MEMSTATS_TLM_MID     CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_MEMSTATS_TLM_MSG /* 0x0810 */
 
 /*

diff --git a/cmake/sample_defs/cpu1_platform_cfg.h b/cmake/sample_defs/cpu1_platform_cfg.h
@@ -565,7 +565,7 @@
 **       in the error log. Any context information beyond this size will
 **       be truncated.
 */
-#define CFE_PLATFORM_ES_ER_LOG_MAX_CONTEXT_SIZE     128
+#define CFE_PLATFORM_ES_ER_LOG_MAX_CONTEXT_SIZE     256
 
 
 /**
@@ -1005,22 +1005,40 @@
 #define CFE_PLATFORM_ES_DEFAULT_CDS_REG_DUMP_FILE     "/ram/cfe_cds_reg.log"
 
 /**
-**  \cfeescfg Define Default System Log Mode
+**  \cfeescfg Define Default System Log Mode following Power On Reset
 **
 **  \par Description:
-**       Defines the default mode for the operation of the ES System log. The log may
-**       operate in either Overwrite mode = 0, where once the log becomes full the
-**       oldest message in the log will be overwritten, or Discard mode = 1, where
-**       once the log becomes full the contents of the log are preserved and the new
-**       event is discarded.  This constant may hold a value of either 0 or 1
-**       depending on the desired default log mode.  Overwrite Mode = 0, Discard
-**       Mode = 1.
+**       Defines the default mode for the operation of the ES System log following a power
+**       on reset. The log may operate in either Overwrite mode = 0, where once the
+**       log becomes full the oldest message in the log will be overwritten, or
+**       Discard mode = 1, where once the log becomes full the contents of the log are
+**       preserved and the new event is discarded.  This constant may hold a value of
+**       either 0 or 1 depending on the desired default.
+**       Overwrite Mode = 0, Discard Mode = 1.
 **
 **  \par Limits
 **       There is a lower limit of 0 and an upper limit of 1 on this configuration
 **       paramater.
 */
-#define CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE      1
+#define CFE_PLATFORM_ES_DEFAULT_POR_SYSLOG_MODE      0
+
+/**
+**  \cfeescfg Define Default System Log Mode following Processor Reset
+**
+**  \par Description:
+**       Defines the default mode for the operation of the ES System log following a
+**       processor reset. The log may operate in either Overwrite mode = 0, where once
+**       the log becomes full the oldest message in the log will be overwritten, or
+**       Discard mode = 1, where once the log becomes full the contents of the log are
+**       preserved and the new event is discarded.  This constant may hold a value of
+**       either 0 or 1 depending on the desired default.
+**       Overwrite Mode = 0, Discard Mode = 1.
+**
+**  \par Limits
+**       There is a lower limit of 0 and an upper limit of 1 on this configuration
+**       paramater.
+*/
+#define CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE      1
 
 /**
 **  \cfeescfg Define Max Number of Performance IDs
@@ -1187,52 +1205,6 @@
 */
 #define CFE_PLATFORM_ES_DEFAULT_STACK_SIZE 8192
 
-/**
-**  \cfeescfg Define cFE Core Exception Function
-**
-**  \par Description:
-**       This parameter defines the function-to-call when a CPU or floating point exception
-**       occurs.  The parameter is defaulted to call the ES API function #CFE_ES_ProcessCoreException
-**       which handles the logging and reset from a system or cFE core exception.
-**
-**       Note: Exception interrupts are trapped at the Platform Support Package (PSP)
-**       layer.  In order to initiate the cFE platform defined response to an exception, this
-**       platform defined callback function must be prototyped and called from the PSP
-**       exception hook API function #CFE_PSP_ExceptionHook. For example:
-**
-**       -- cfe_psp.h --
-**
-**       .... Prototype for exception ISR function implemented in CFE ....
-**
-**       typedef void (*System_ExceptionFunc_t)(uint32  HostTaskId,
-**                                              const char *ReasonString,
-**                                              const uint32 *ContextPointer,
-**                                              uint32 ContextSize);
-**
-**       -- cfe_pspexception.c --
-**
-**       .... Setup function pointer to CFE exception ISR callback ....
-**
-**       static const System_ExceptionFunc_t CFE_ExceptionCallback = CFE_PLATFORM_ES_EXCEPTION_FUNCTION;
-**
-**       void CFE_PSP_ExceptionHook (int task_id, int vector, uint8 *pEsf )
-**       {
-**           .... platform-specific logic ....
-**
-**           .... Use function pointer to call cFE routine to finish processing the exception ....
-**
-**           CFE_ExceptionCallback((uint32)task_id,
-**                                 CFE_PSP_ExceptionReasonString,
-**                                 (uint32 *)&CFE_PSP_ExceptionContext,
-**                                 sizeof(CFE_PSP_ExceptionContext_t));
-**
-**       }
-**
-**  \par Limits
-**       Must be a valid function name.
-*/
-#define CFE_PLATFORM_ES_EXCEPTION_FUNCTION CFE_ES_ProcessCoreException
-
 /**
 **  \cfeescfg Define EVS Task Priority
 **
@@ -1997,7 +1969,7 @@
 #define CFE_ES_DEFAULT_ER_LOG_FILE          CFE_PLATFORM_ES_DEFAULT_ER_LOG_FILE
 #define CFE_ES_DEFAULT_PERF_DUMP_FILENAME   CFE_PLATFORM_ES_DEFAULT_PERF_DUMP_FILENAME
 #define CFE_ES_DEFAULT_CDS_REG_DUMP_FILE    CFE_PLATFORM_ES_DEFAULT_CDS_REG_DUMP_FILE
-#define CFE_ES_DEFAULT_SYSLOG_MODE          CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE
+#define CFE_ES_DEFAULT_SYSLOG_MODE          CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE
 #define CFE_ES_PERF_MAX_IDS                 CFE_PLATFORM_ES_PERF_MAX_IDS
 #define CFE_ES_PERF_DATA_BUFFER_SIZE        CFE_PLATFORM_ES_PERF_DATA_BUFFER_SIZE
 #define CFE_ES_PERF_FILTMASK_NONE           CFE_PLATFORM_ES_PERF_FILTMASK_NONE