Merge 'srsran/master' into 'lc/main'

Author: rjonaitis

.github/workflows/ccpp.yml

@@ -7,27 +7,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-20.04]
+        os: [ubuntu-24.04, ubuntu-22.04]
         compiler: [gcc, clang]
     steps:
     - uses: actions/checkout@v3
     - name: Build srsRAN on x86 ${{ matrix.os }}
       run: |
         sudo apt update
-        sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
-        mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
+        sudo apt install -y --no-install-recommends build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libboost-system-dev libconfig++-dev libsctp-dev ninja-build
+        mkdir build && cd build &&
+        if [ "${{ matrix.os }}" = "ubuntu-24.04" ]; then
+          cmake -DENABLE_WERROR=False -DRF_FOUND=True -GNinja ..
+        else
+          cmake -DRF_FOUND=True -GNinja ..
+        fi
+        export CTEST_PARALLEL_LEVEL=$(nproc --all)
+        ninja && ninja test
 
   aarch64_ubuntu_build:
     name: Build on aarch64
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-24.04, ubuntu-22.04]
         compiler: [gcc, clang]
         include:
-          - os: ubuntu-20.04
-            distro: ubuntu20.04
+          - os: ubuntu-24.04
+            distro: ubuntu24.04
+          - os: ubuntu-22.04
+            distro: ubuntu22.04
     steps:
     - uses: actions/checkout@v3
     - name: Build srsRAN on aarch64 ${{ matrix.os }}
@@ -38,5 +47,5 @@ jobs:
         run: |
           export CTEST_PARALLEL_LEVEL=$(nproc --all)
           apt update
-          apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev ninja-build
-          ls -l && pwd && mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja
+          apt install -y build-essential --no-install-recommends cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libboost-system-dev libconfig++-dev libsctp-dev ninja-build
+          mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja

.github/workflows/codeql.yml

@@ -44,14 +44,14 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,6 +64,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

CHANGELOG

@@ -1,5 +1,9 @@
 Change Log for Releases
 =======================
+## 25.10
+  * Various compilation fixes for newer compiler versions
+  * Smaller improvements in various layers
+
 ## 23.04
   * Introduced configurable s1 connection timer
   * Updated 4G RRC ASN.1 to Rel 17
@@ -10,7 +14,6 @@ Change Log for Releases
   * Added basic support for RIC E2 interface
   * other bug-fixes and improved stability and performance in all parts
 
-
 ## 22.10
   * Fix DL NAS integrity checks in srsUE
   * Remove Travis and LGTM as CI platforms

CMakeLists.txt

@@ -73,7 +73,6 @@ option(ENABLE_RF_PLUGINS     "Enable RF plugins"                        OFF)
 option(ENABLE_UHD            "Enable UHD"                               ON)
 option(ENABLE_BLADERF        "Enable BladeRF"                           ON)
 option(ENABLE_SOAPYSDR       "Enable SoapySDR"                          ON)
-option(ENABLE_SKIQ           "Enable Sidekiq SDK"                       ON)
 option(ENABLE_LIMESDR        "Enable LimeSDR"                           ON)
 option(ENABLE_ZEROMQ         "Enable ZeroMQ"                            ON)
 option(ENABLE_HARDSIM        "Enable support for SIM cards"             ON)
@@ -217,15 +216,6 @@ if(ENABLE_UHD)
   endif(UHD_FOUND)
 endif(ENABLE_UHD)
 
-# SKIQ
-if (ENABLE_SKIQ)
-  find_package(SKIQ)
-  if(SKIQ_FOUND)
-    include_directories(${SKIQ_INCLUDE_DIRS})
-    link_directories(${SKIQ_LIBRARY_DIRS})
-  endif(SKIQ_FOUND)
-endif (ENABLE_SKIQ)
-
 # BladeRF
 if(ENABLE_BLADERF)
   find_package(bladeRF)
@@ -267,12 +257,12 @@ if(ENABLE_TIMEPROF)
     add_definitions(-DENABLE_TIMEPROF)
 endif(ENABLE_TIMEPROF)
 
-if(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND OR LIMESDR_FOUND)
+if(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR LIMESDR_FOUND)
   set(RF_FOUND TRUE CACHE INTERNAL "RF frontend found")
-else(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND LIMESDR_FOUND)
+else(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR LIMESDR_FOUND)
   set(RF_FOUND FALSE CACHE INTERNAL "RF frontend found")
   add_definitions(-DDISABLE_RF)
-endif(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR SKIQ_FOUND OR LIMESDR_FOUND)
+endif(BLADERF_FOUND OR UHD_FOUND OR SOAPYSDR_FOUND OR ZEROMQ_FOUND OR LIMESDR_FOUND)
 
 # Boost
 if(BUILD_STATIC)

README.md

@@ -1,9 +1,8 @@
 srsRAN
 ======
 
-[![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
-[![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
-[![Coverity](https://scan.coverity.com/projects/28268/badge.svg)](https://scan.coverity.com/projects/srsran_4g_agpl)
+[![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
+[![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
 
 srsRAN is an open source 4G software radio suite developed by [SRS](http://www.srs.io). For 5G RAN, see our new O-RAN CU/DU solution - [srsRAN Project](https://www.github.com/srsran/srsran_project).
 

cmake/modules/FindSKIQ.cmake

@@ -18,8 +18,8 @@
 # and at http://www.gnu.org/licenses/.
 #
 
-SET(SRSRAN_VERSION_MAJOR 23)
-SET(SRSRAN_VERSION_MINOR 04)
+SET(SRSRAN_VERSION_MAJOR 25)
+SET(SRSRAN_VERSION_MINOR 10)
 SET(SRSRAN_VERSION_PATCH 0)
 SET(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")
 SET(SRSRAN_SOVERSION 0)

cmake/modules/SRSRANVersion.cmake

@@ -235,25 +235,26 @@ class dyn_array
       return;
     }
     if (cap_ >= new_size) {
+      if (new_size > size_) {
+        std::fill(data_ + size_, data_ + new_size, T());
+      }
       size_ = new_size;
       return;
     }
 
-    T* old_data = data_;
-    cap_        = new_size > new_cap ? new_size : new_cap;
-    if (cap_ > 0) {
-      data_ = new T[cap_];
-      if (old_data != NULL) {
-        srsran_assert(cap_ > size_, "Old size larger than new capacity in dyn_array\n");
-        std::copy(&old_data[0], &old_data[size_], data_);
+    new_cap     = new_size > new_cap ? new_size : new_cap;
+    T* new_data = nullptr;
+    if (new_cap > 0) {
+      new_data = new T[new_cap];
+      if (data_ != nullptr) {
+        unsigned min_size = std::min(size_, new_size);
+        std::move(data_, data_ + min_size, new_data);
       }
-    } else {
-      data_ = NULL;
     }
+    cap_  = new_cap;
     size_ = new_size;
-    if (old_data != NULL) {
-      delete[] old_data;
-    }
+    delete[] data_;
+    data_ = new_data;
   }
   iterator erase(iterator it)
   {

lib/include/srsran/asn1/asn1_utils.h

@@ -53,7 +53,7 @@ class block_queue
     virtual void pushing(const myobj& obj) = 0;
   };
 
-  explicit block_queue<myobj>(int capacity_ = -1)
+  explicit block_queue(int capacity_ = -1)
   {
     pthread_mutex_init(&mutex, NULL);
     pthread_cond_init(&cv_empty, NULL);
@@ -63,6 +63,7 @@ class block_queue
     enable           = true;
     num_threads      = 0;
   }
+
   ~block_queue()
   {
     // Unlock threads waiting at push or pop

lib/include/srsran/common/block_queue.h

@@ -41,6 +41,22 @@ class rrc_interface_mac
 
   ///< Provide packed SIB to MAC (buffer is managed by RRC)
   virtual uint8_t* read_pdu_bcch_dlsch(const uint8_t enb_cc_idx, const uint32_t sib_index) = 0;
+
+  /// \brief Provides the packed SIBs in a System Information (SI) message consisting of different segments to the MAC.
+  ///
+  /// This method must be used when the desired SIB in a SI message is segmented, i.e., when the contents of the SIB are
+  /// split across different versions of the SIB. In this case, the SIB segments are scheduled in sequence, as per
+  /// TS36.331 Sections 5.2.1.4 and 5.2.1.5.
+  ///
+  /// \param[in] enb_cc_idx        Index of the ENB CC.
+  /// \param[in] sib_index         Index of the System Information (SI) message containing the SIB. It corresponds with
+  ///                              the ordering of the SI messages in the SIB1 scheduling information list.
+  /// \param[in] sib_segment_index Index of the SIB segment to retrieve.
+  ///
+  /// \return A pointer to the desired SIB message segment.
+  /// \remark An assertion is thrown if the SIB message is not segmented.
+  virtual uint8_t*
+  read_pdu_bcch_dlsch(const uint8_t enb_cc_idx, const uint32_t sib_index, const uint32_t sib_segment_index) = 0;
 };
 
 } // namespace srsenb