Merge pull request #1251 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev9

.github/workflows/codeql-cfe-build.yml

@@ -9,7 +9,5 @@ jobs:
     name: CodeQl Analysis
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
     with: 
-      make: 'make -j native/default_cpu1/osal/'
       component-path: osal
-      test: true
-
+      make: 'make -C build/native/default_cpu1/osal'

.github/workflows/codeql-osal-default.yml

@@ -7,8 +7,9 @@ on:
 jobs:
   codeql:
     name: CodeQl Analysis
-    uses: nasa/cFS/.github/workflows/codeql-build.yml@main
+    uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
     with: 
-      setup: 'cd osal && cp Makefile.sample Makefile'
-      make-prep: 'cd osal && make prep'
-      make: 'cd osal && make -j'
+      component-path: cFS  # Causes reusable workflow to not checkout bundle
+      setup: 'cp Makefile.sample Makefile'
+      prep: 'make prep'
+      make: 'make'

README.md

@@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: v6.0.0-rc4+dev74
+
+- Update codeql workflows for reusable update
+- add os-impl-no-select.c for RTEMS
+- See <https://github.com/nasa/osal/pull/1251> and <https://github.com/nasa/cFS/pull/471>
+
 ### Development Build: v6.0.0-rc4+dev66
 
 - Fix UtAssert_StringBufCompare SEGV when -1 for size passed in (on CentOS 7)
@@ -284,7 +290,7 @@ the declarations, and generates a source file with stub definitions that rely on
 
 ### Development Build: v5.1.0-rc1+dev297
 
-- Fix #836, Add Testing Tools to the Security Policy
+- Add Testing Tools to the Security Policy
 - See <https://github.com/nasa/osal/pull/838>
 
 ### Development Build: v5.1.0-rc1+dev293

src/os/inc/osapi-version.h

@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   66
+#define OS_BUILD_NUMBER   74
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

src/os/portable/os-impl-no-select.c

@@ -0,0 +1,78 @@
+/************************************************************************
+ * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes”
+ *
+ * Copyright (c) 2020 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ************************************************************************/
+
+/**
+ * \file   os-impl-no-select.c
+ * \author [email protected]
+ *
+ * Purpose: All functions return OS_ERR_NOT_IMPLEMENTED.
+ * This is used when network functionality is disabled by config.
+ */
+
+/****************************************************************************************
+                                    INCLUDE FILES
+ ***************************************************************************************/
+
+#include <osapi.h>
+#include "os-shared-select.h"
+
+/****************************************************************************************
+                                     DEFINES
+ ***************************************************************************************/
+
+/***************************************************************************************
+                                 FUNCTION PROTOTYPES
+ **************************************************************************************/
+
+/****************************************************************************************
+                                   GLOBAL DATA
+ ***************************************************************************************/
+
+/****************************************************************************************
+                                LOCAL FUNCTIONS
+ ***************************************************************************************/
+
+/****************************************************************************************
+                                SELECT API
+ ***************************************************************************************/
+
+/*----------------------------------------------------------------
+ *
+ * Function: OS_SelectSingle_Impl
+ *
+ *  Purpose: Implemented per internal OSAL API
+ *           See prototype for argument/return detail
+ *
+ *-----------------------------------------------------------------*/
+int32 OS_SelectSingle_Impl(const OS_object_token_t *token, uint32 *SelectFlags, int32 msecs)
+{
+    return OS_ERR_NOT_IMPLEMENTED;
+} /* end OS_SelectSingle_Impl */
+
+/*----------------------------------------------------------------
+ *
+ * Function: OS_SelectMultiple_Impl
+ *
+ *  Purpose: Implemented per internal OSAL API
+ *           See prototype for argument/return detail
+ *
+ *-----------------------------------------------------------------*/
+int32 OS_SelectMultiple_Impl(OS_FdSet *ReadSet, OS_FdSet *WriteSet, int32 msecs)
+{
+    return OS_ERR_NOT_IMPLEMENTED;
+} /* end OS_SelectMultiple_Impl */

src/os/rtems/CMakeLists.txt

@@ -30,7 +30,6 @@ set(RTEMS_BASE_SRCLIST
 set(RTEMS_IMPL_SRCLIST
     ../portable/os-impl-posix-gettime.c
     ../portable/os-impl-console-bsp.c
-    ../portable/os-impl-bsd-select.c
     ../portable/os-impl-posix-io.c
     ../portable/os-impl-posix-files.c
     ../portable/os-impl-posix-dirs.c
@@ -61,11 +60,13 @@ if (OSAL_CONFIG_INCLUDE_NETWORK)
     list(APPEND RTEMS_IMPL_SRCLIST
         src/os-impl-network.c
         ../portable/os-impl-bsd-sockets.c
+        ../portable/os-impl-bsd-select.c
     )
 else()
     list(APPEND RTEMS_IMPL_SRCLIST
         ../portable/os-impl-no-network.c
         ../portable/os-impl-no-sockets.c
+        ../portable/os-impl-no-select.c
     )
 endif ()