Update main

# Conflicts: # include/srsran/adt/bitmap_utils.h # include/srsran/f1u/cu_up/f1u_bearer.h # include/srsran/f1u/cu_up/f1u_bearer_factory.h # include/srsran/f1u/cu_up/f1u_rx_delivery_notifier.h # include/srsran/f1u/cu_up/f1u_rx_pdu_handler.h # include/srsran/f1u/cu_up/f1u_rx_sdu_notifier.h # include/srsran/f1u/cu_up/f1u_tx_pdu_notifier.h # include/srsran/f1u/cu_up/f1u_tx_sdu_handler.h # include/srsran/f1u/du/f1u_bearer.h # include/srsran/f1u/du/f1u_bearer_factory.h # include/srsran/f1u/du/f1u_config.h # include/srsran/f1u/du/f1u_rx_pdu_handler.h # include/srsran/f1u/du/f1u_rx_sdu_notifier.h # include/srsran/f1u/du/f1u_tx_delivery_handler.h # include/srsran/f1u/du/f1u_tx_pdu_notifier.h # include/srsran/f1u/du/f1u_tx_sdu_handler.h # include/srsran/f1u/local_connector/f1u_local_bearer_adapter.h # include/srsran/f1u/local_connector/f1u_local_connector.h # include/srsran/phy/upper/rx_softbuffer_pool.h # include/srsran/phy/upper/unique_rx_softbuffer.h # include/srsran/ran/precoding/precoding_weight_matrix_formatters.h # lib/e2/e2sm/e2sm_param_provider.h # lib/f1u/cu_up/f1u_bearer_factory.cpp # lib/f1u/cu_up/f1u_bearer_impl.cpp # lib/f1u/du/f1u_bearer_factory.cpp # lib/f1u/du/f1u_bearer_impl.cpp # lib/f1u/local_connector/f1u_local_connector.cpp # lib/hal/dpdk/bbdev/CMakeLists.txt # lib/phy/support/resource_grid_pool_impl.cpp # lib/phy/support/resource_grid_pool_impl.h # lib/phy/upper/channel_processors/pdsch_codeblock_processor.h # lib/phy/upper/channel_processors/pusch/pusch_processor_logging_decorator.h # lib/phy/upper/rx_softbuffer_impl.h # lib/phy/upper/rx_softbuffer_pool_impl.cpp # lib/phy/upper/rx_softbuffer_pool_impl.h # lib/scheduler/policy/scheduler_time_rr.cpp # lib/scheduler/policy/scheduler_time_rr.h # lib/scheduler/policy/ue_allocator.h # lib/scheduler/support/dci_builder.cpp # lib/scheduler/support/dci_builder.h # lib/scheduler/support/sch_pdu_builder.cpp # lib/scheduler/support/sch_pdu_builder.h # lib/scheduler/ue_scheduling/ue_cell_grid_allocator.cpp # lib/scheduler/ue_scheduling/ue_cell_grid_allocator.h # lib/support/version/version.cpp # tests/unittests/cu_cp/CMakeLists.txt # tests/unittests/cu_up/CMakeLists.txt # tests/unittests/fapi/builders/uci_indication_test.cpp # tests/unittests/fapi_adaptor/phy/messages/dl_pdcch_pdu_test.cpp # tests/unittests/fapi_adaptor/phy/messages/dl_pdsch_pdu_test.cpp # tests/unittests/phy/upper/channel_processors/CMakeLists.txt # tests/unittests/phy/upper/rx_softbuffer_pool_test.cpp # tests/unittests/phy/upper/tx_softbuffer_pool_test_doubles.h
srsran · Jan 15, 2024 · 0b2702c · 0b2702c
2 parents dcd905c + eb62d6e
commit 0b2702c
Show file tree

Hide file tree

Showing 3,268 changed files with 15,239 additions and 8,219 deletions.
diff --git a/.gdbinit b/.gdbinit
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # By using this file, you agree to the terms and conditions set
 # forth in the LICENSE file which can be found at the top level of

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # This file is part of srsRAN
 #
@@ -96,6 +96,21 @@ trigger docker:
 ################################################################################
 ## Static
 ################################################################################
+headers:
+  image: ubuntu
+  stage: static
+  rules:
+    - if: $ON_MR
+      exists:
+        - "**/CMakeLists.txt"
+        - "**/Dockerfile"
+        - "**/*.cmake"
+        - "**/*.yml"
+        - "**/*.sh"
+  script:
+    - .gitlab/ci/release/update_headers.sh
+  needs: []
+
 include-guards:
   extends: .include-guards
   parallel:

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -195,9 +195,11 @@ variables:
 
         if [ -n "${DPDK_VERSION}" ]; then
           BUILD_CMD="-d ${DPDK_VERSION} ${BUILD_CMD}"
+          LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
         fi
         if [ -n "${UHD_VERSION}" ]; then
           BUILD_CMD="-u ${UHD_VERSION} ${BUILD_CMD}"
+          LD_LIBRARY_PATH=/opt/uhd/${UHD_VERSION}/lib:${LD_LIBRARY_PATH}
         fi
         if [ -n "${CLEAN_BUILD}" ]; then
           BUILD_CMD="-r ${CLEAN_BUILD} ${BUILD_CMD}"

diff --git a/.gitlab/ci/builders/install_dependencies.sh b/.gitlab/ci/builders/install_dependencies.sh
@@ -54,10 +54,10 @@ main() {
 
     elif [[ "$ID" == "rhel" ]]; then
         if [[ "$mode" == "all" || "$mode" == "build" ]]; then
-            dnf -y install cmake fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel gcc-toolset-11 gcc-toolset-11-gcc-c++
+            dnf -y install cmake fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel gcc-toolset-11 gcc-toolset-11-gcc-c++ gcc-toolset-12-libatomic-devel
         fi
         if [[ "$mode" == "all" || "$mode" == "run" ]]; then
-            dnf -y install fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel
+            dnf -y install fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel gcc-toolset-12-libatomic-devel
         fi
         if [[ "$mode" == "all" || "$mode" == "extra" ]]; then
             dnf -y install cppzmq-devel libusb1-devel boost-devel numactl-devel # dpdk libelf libdwarf

diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -313,13 +313,11 @@ rf-asan:
     - job: "basic asan"
       artifacts: true
     - *retina-needs
-  allow_failure: true
 
 rf-b200-config:
   extends: .rf
   variables:
     MARKERS: "rf_b200"
-  allow_failure: true
 
 rf-n300-config:
   extends: .rf
@@ -374,10 +372,8 @@ viavi:
   extends: .e2e-run
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly/
-      when: manual
-      allow_failure: true
-      # when: delayed
-      # start_in: 7 hours
+      when: delayed
+      start_in: 5 hours
   variables:
     GROUP: "viavi"
     TESTBED: "viavi"

diff --git a/.gitlab/ci/e2e/.env b/.gitlab/ci/e2e/.env
@@ -1,9 +1,9 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.38.0
+RETINA_VERSION=0.40.0
 AMARISOFT_VERSION=2023-03-17
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.5.6
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-METRICS_SERVER_VERSION=1.5.0
+METRICS_SERVER_VERSION=1.5.1
 DPDK_VERSION=23.07
diff --git a/.gitlab/ci/release/auto_merge.sh b/.gitlab/ci/release/auto_merge.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # By using this file, you agree to the terms and conditions set
 # forth in the LICENSE file which can be found at the top level of
@@ -97,56 +97,6 @@ remove_lfs_files() {
     done < <(git lfs ls-files | sed -r 's/^.{13}//')
 }
 
-update_headers() {
-    echo "=================="
-    echo "= Update headers ="
-    echo "=================="
-
-    # for actual source and header files
-    find . -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.h.in" \) ! -path "*/external/*" ! -name "rfnoc_test.cc" -exec perl -0777 -pi -e "s{/\*.*?\*/}{/*
- *
- * Copyright 2021-$(date +%Y) Software Radio Systems Limited
- *
- * This file is part of srsRAN.
- *
- * srsRAN is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * srsRAN is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * A copy of the GNU Affero General Public License can be found in
- * the LICENSE file in the top-level directory of this distribution
- * and at http://www.gnu.org/licenses/.
- *
- */}s" {} \;
-
-    # for CMake/YML files
-    find . -type f -\( -name "CMakeLists.txt" -o -name "*.cmake" -o -name "*.yml" -o -name "*.sh" -o -name "Dockerfile" \) ! -path "*/configs/*" ! -path "*/.github/*" ! -path "*/.gitlab/*" ! -path "*/docker/open5gs/*" ! -name "FindBackward.cmake" ! -name "FindRapidJSON.cmake" ! -name "CheckCSourceRuns.cmake" ! -name "CheckFunctionExistsMath.cmake" -exec perl -0777 -pi -e "s/#[^!][\s\S]*?(?=\n.*?=|\n\n)/#
-# Copyright 2021-$(date +%Y) Software Radio Systems Limited
-#
-# This file is part of srsRAN
-#
-# srsRAN is free software: you can redistribute it and\/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# srsRAN is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# A copy of the GNU Affero General Public License can be found in
-# the LICENSE file in the top-level directory of this distribution
-# and at http:\/\/www.gnu.org\/licenses\/.
-#/" {} \;
-}
-
 main() {
     # Check number of args
     if [ $# != 2 ] && [ $# != 3 ]; then
@@ -181,7 +131,7 @@ main() {
         git commit --no-edit
     fi
     remove_lfs_files
-    update_headers
+    "$(dirname "$0")/update_headers.sh"
     git commit -a --amend --no-edit
 
     # Push

diff --git a/.gitlab/ci/release/update_headers.sh b/.gitlab/ci/release/update_headers.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# Copyright 2021-2024 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set -e
+
+echo "=================="
+echo "= Update headers ="
+echo "=================="
+
+# for CMake/YML files
+find . -type f -\( -name "CMakeLists.txt" -o -name "*.cmake" -o -name "*.yml" -o -name "*.sh" -o -name "Dockerfile" \) \
+    ! -path "*/configs/*" ! -path "*/.github/*" ! -path "*/.gitlab/*" ! -path "*/docker/open5gs/*" ! -name "FindBackward.cmake" \
+    -print0 | while IFS= read -r -d '' file; do
+
+    # Check header format
+    found_header=false
+    while IFS= read -r line; do
+        if [ -z "$line" ] && [ "$found_header" = false ]; then
+            continue # Ignore empty lines before first comment block
+        elif [[ "$line" =~ ^#.*$ ]]; then
+            found_header=true
+            continue # This line start with #. Keep reading
+        elif [[ -z "$line" ]]; then
+            break # Empty line after the header block. The format is valid and exit.
+        else
+            echo "$file: Header (or empty line after it) is missing."
+            exit 1
+        fi
+    done <"$file"
+
+    # Replace header
+    perl -0777 -pi -e "s/#[^!][\s\S]*?(?=\n.*?=|\n\n)/#
+# Copyright 2021-$(date +%Y) Software Radio Systems Limited
+#
+# This file is part of srsRAN
+#
+# srsRAN is free software: you can redistribute it and\/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# srsRAN is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# A copy of the GNU Affero General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http:\/\/www.gnu.org\/licenses\/.
+#/" "$file"
+
+done
+
+# for actual source and header files
+find . -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.h.in" \) \
+    ! -path "*/external/*" ! -name "rfnoc_test.cc" \
+    -exec perl -0777 -pi -e "s{/\*.*?\*/}{/*
+ *
+ * Copyright 2021-$(date +%Y) Software Radio Systems Limited
+ *
+ * This file is part of srsRAN.
+ *
+ * srsRAN is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsRAN is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */}s" {} \;
diff --git a/.gitlab/ci/schedules.yml b/.gitlab/ci/schedules.yml
@@ -18,7 +18,7 @@
 # and at http://www.gnu.org/licenses/.
 #
 Rebaser:
-  cron: "*/10 6-23 * * 1-5"
+  cron: "*/10 6-22 * * 1-5"
   cron_timezone: "Europe/Madrid"
   ref: dev
   active: true

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # This file is part of srsRAN
 #

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,13 +1,13 @@
 Files: *
-Copyright: 2021-2023, Software Radio Systems Limited.
+Copyright: 2021-2024, Software Radio Systems Limited.
 License:   See LICENSE file
 
 
 The following files are used within srsRAN:
 
 Files:     docs/doxygen-awesome-sidebar-only.css
            docs/doxygen-awesome.css
-Copyright: 2021-2022 jothepro
+Copyright: 2021-2024 jothepro
 License:   MIT
 
 
@@ -55,6 +55,11 @@ Copyright: 2018 Erik Rigtorp
 License:   MIT
 
 
+Files:     external/cameron314/concurrentqueue.hpp
+Copyright: 2013-2020, Cameron Desrochers
+License:   Simplified BSD
+
+
 License: MIT
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the "Software"),

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # This file is part of srsRAN
 #

diff --git a/apps/examples/CMakeLists.txt b/apps/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # This file is part of srsRAN
 #

diff --git a/apps/examples/du/CMakeLists.txt b/apps/examples/du/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2023 Software Radio Systems Limited
+# Copyright 2021-2024 Software Radio Systems Limited
 #
 # This file is part of srsRAN
 #

diff --git a/apps/examples/du/du_example.cpp b/apps/examples/du/du_example.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2021-2023 Software Radio Systems Limited
+ * Copyright 2021-2024 Software Radio Systems Limited
  *
  * This file is part of srsRAN.
  *
@@ -730,7 +730,6 @@ int main(int argc, char** argv)
       generate_carrier_config_tlv(),
       std::move(std::get<std::unique_ptr<fapi_adaptor::precoding_matrix_repository>>(pm_tools)),
       std::move(std::get<std::unique_ptr<fapi_adaptor::uci_part2_correspondence_repository>>(uci_part2_tools)),
-      *dl_executors.front(),
       upper->get_tx_buffer_pool(),
       {0});
   report_error_if_not(phy_adaptor, "Unable to create PHY adaptor.");

diff --git a/apps/examples/du/fapi_factory.cpp b/apps/examples/du/fapi_factory.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2021-2023 Software Radio Systems Limited
+ * Copyright 2021-2024 Software Radio Systems Limited
  *
  * This file is part of srsRAN.
  *
@@ -41,7 +41,6 @@ srsran::build_phy_fapi_adaptor(unsigned
                                const fapi::carrier_config&                                        carrier_cfg,
                                std::unique_ptr<precoding_matrix_repository>                       pm_repo,
                                std::unique_ptr<fapi_adaptor::uci_part2_correspondence_repository> part2_repo,
-                               task_executor&                                                     async_executor,
                                tx_buffer_pool&                                                    buffer_pool,
                                std::vector<uint8_t>                                               prach_ports)
 {
@@ -70,7 +69,6 @@ srsran::build_phy_fapi_adaptor(unsigned
   phy_fapi_dependencies.ul_pdu_validator     = &ul_pdu_validator;
   phy_fapi_dependencies.pm_repo              = std::move(pm_repo);
   phy_fapi_dependencies.part2_repo           = std::move(part2_repo);
-  phy_fapi_dependencies.async_executor       = &async_executor;
 
   return adaptor_factory->create(phy_fapi_config, std::move(phy_fapi_dependencies));
 }

diff --git a/apps/examples/du/fapi_factory.h b/apps/examples/du/fapi_factory.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2021-2023 Software Radio Systems Limited
+ * Copyright 2021-2024 Software Radio Systems Limited
  *
  * This file is part of srsRAN.
  *
@@ -45,7 +45,6 @@ build_phy_fapi_adaptor(unsigned
                        const fapi::carrier_config&                                        carrier_cfg,
                        std::unique_ptr<fapi_adaptor::precoding_matrix_repository>         pm_repo,
                        std::unique_ptr<fapi_adaptor::uci_part2_correspondence_repository> part2_repo,
-                       task_executor&                                                     async_executor,
                        tx_buffer_pool&                                                    buffer_pool,
                        std::vector<uint8_t>                                               prach_ports);