Skip to content

Commit 0b2702c

Browse files
author
codebot
committed
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
2 parents dcd905c + eb62d6e commit 0b2702c

File tree

3,268 files changed

+15239
-8219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,268 files changed

+15239
-8219
lines changed

‎.gdbinit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2021-2023 Software Radio Systems Limited
2+
# Copyright 2021-2024 Software Radio Systems Limited
33
#
44
# By using this file, you agree to the terms and conditions set
55
# forth in the LICENSE file which can be found at the top level of

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2021-2023 Software Radio Systems Limited
2+
# Copyright 2021-2024 Software Radio Systems Limited
33
#
44
# This file is part of srsRAN
55
#
@@ -96,6 +96,21 @@ trigger docker:
9696
################################################################################
9797
## Static
9898
################################################################################
99+
headers:
100+
image: ubuntu
101+
stage: static
102+
rules:
103+
- if: $ON_MR
104+
exists:
105+
- "**/CMakeLists.txt"
106+
- "**/Dockerfile"
107+
- "**/*.cmake"
108+
- "**/*.yml"
109+
- "**/*.sh"
110+
script:
111+
- .gitlab/ci/release/update_headers.sh
112+
needs: []
113+
99114
include-guards:
100115
extends: .include-guards
101116
parallel:

‎.gitlab/ci/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,11 @@ variables:
195195
196196
if [ -n "${DPDK_VERSION}" ]; then
197197
BUILD_CMD="-d ${DPDK_VERSION} ${BUILD_CMD}"
198+
LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
198199
fi
199200
if [ -n "${UHD_VERSION}" ]; then
200201
BUILD_CMD="-u ${UHD_VERSION} ${BUILD_CMD}"
202+
LD_LIBRARY_PATH=/opt/uhd/${UHD_VERSION}/lib:${LD_LIBRARY_PATH}
201203
fi
202204
if [ -n "${CLEAN_BUILD}" ]; then
203205
BUILD_CMD="-r ${CLEAN_BUILD} ${BUILD_CMD}"

‎.gitlab/ci/builders/install_dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ main() {
5454

5555
elif [[ "$ID" == "rhel" ]]; then
5656
if [[ "$mode" == "all" || "$mode" == "build" ]]; then
57-
dnf -y install cmake fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel gcc-toolset-11 gcc-toolset-11-gcc-c++
57+
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
5858
fi
5959
if [[ "$mode" == "all" || "$mode" == "run" ]]; then
60-
dnf -y install fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel
60+
dnf -y install fftw-devel lksctp-tools-devel yaml-cpp-devel mbedtls-devel gcc-toolset-12-libatomic-devel
6161
fi
6262
if [[ "$mode" == "all" || "$mode" == "extra" ]]; then
6363
dnf -y install cppzmq-devel libusb1-devel boost-devel numactl-devel # dpdk libelf libdwarf

‎.gitlab/ci/e2e.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,11 @@ rf-asan:
313313
- job: "basic asan"
314314
artifacts: true
315315
- *retina-needs
316-
allow_failure: true
317316

318317
rf-b200-config:
319318
extends: .rf
320319
variables:
321320
MARKERS: "rf_b200"
322-
allow_failure: true
323321

324322
rf-n300-config:
325323
extends: .rf
@@ -374,10 +372,8 @@ viavi:
374372
extends: .e2e-run
375373
rules:
376374
- if: $CI_DESCRIPTION =~ /Nightly/
377-
when: manual
378-
allow_failure: true
379-
# when: delayed
380-
# start_in: 7 hours
375+
when: delayed
376+
start_in: 5 hours
381377
variables:
382378
GROUP: "viavi"
383379
TESTBED: "viavi"

‎.gitlab/ci/e2e/.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.38.0
3+
RETINA_VERSION=0.40.0
44
AMARISOFT_VERSION=2023-03-17
55
SRSUE_VERSION=23.11
66
OPEN5GS_VERSION=2.5.6
77
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
8-
METRICS_SERVER_VERSION=1.5.0
8+
METRICS_SERVER_VERSION=1.5.1
99
DPDK_VERSION=23.07

‎.gitlab/ci/release/auto_merge.sh‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2021-2023 Software Radio Systems Limited
3+
# Copyright 2021-2024 Software Radio Systems Limited
44
#
55
# By using this file, you agree to the terms and conditions set
66
# forth in the LICENSE file which can be found at the top level of
@@ -97,56 +97,6 @@ remove_lfs_files() {
9797
done < <(git lfs ls-files | sed -r 's/^.{13}//')
9898
}
9999

100-
update_headers() {
101-
echo "=================="
102-
echo "= Update headers ="
103-
echo "=================="
104-
105-
# for actual source and header files
106-
find . -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.h.in" \) ! -path "*/external/*" ! -name "rfnoc_test.cc" -exec perl -0777 -pi -e "s{/\*.*?\*/}{/*
107-
*
108-
* Copyright 2021-$(date +%Y) Software Radio Systems Limited
109-
*
110-
* This file is part of srsRAN.
111-
*
112-
* srsRAN is free software: you can redistribute it and/or modify
113-
* it under the terms of the GNU Affero General Public License as
114-
* published by the Free Software Foundation, either version 3 of
115-
* the License, or (at your option) any later version.
116-
*
117-
* srsRAN is distributed in the hope that it will be useful,
118-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
119-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120-
* GNU Affero General Public License for more details.
121-
*
122-
* A copy of the GNU Affero General Public License can be found in
123-
* the LICENSE file in the top-level directory of this distribution
124-
* and at http://www.gnu.org/licenses/.
125-
*
126-
*/}s" {} \;
127-
128-
# for CMake/YML files
129-
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)/#
130-
# Copyright 2021-$(date +%Y) Software Radio Systems Limited
131-
#
132-
# This file is part of srsRAN
133-
#
134-
# srsRAN is free software: you can redistribute it and\/or modify
135-
# it under the terms of the GNU Affero General Public License as
136-
# published by the Free Software Foundation, either version 3 of
137-
# the License, or (at your option) any later version.
138-
#
139-
# srsRAN is distributed in the hope that it will be useful,
140-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
141-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
142-
# GNU Affero General Public License for more details.
143-
#
144-
# A copy of the GNU Affero General Public License can be found in
145-
# the LICENSE file in the top-level directory of this distribution
146-
# and at http:\/\/www.gnu.org\/licenses\/.
147-
#/" {} \;
148-
}
149-
150100
main() {
151101
# Check number of args
152102
if [ $# != 2 ] && [ $# != 3 ]; then
@@ -181,7 +131,7 @@ main() {
181131
git commit --no-edit
182132
fi
183133
remove_lfs_files
184-
update_headers
134+
"$(dirname "$0")/update_headers.sh"
185135
git commit -a --amend --no-edit
186136

187137
# Push

‎.gitlab/ci/release/update_headers.sh‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
#!/bin/bash
2+
#
3+
# Copyright 2021-2024 Software Radio Systems Limited
4+
#
5+
# By using this file, you agree to the terms and conditions set
6+
# forth in the LICENSE file which can be found at the top level of
7+
# the distribution.
8+
#
9+
10+
set -e
11+
12+
echo "=================="
13+
echo "= Update headers ="
14+
echo "=================="
15+
16+
# for CMake/YML files
17+
find . -type f -\( -name "CMakeLists.txt" -o -name "*.cmake" -o -name "*.yml" -o -name "*.sh" -o -name "Dockerfile" \) \
18+
! -path "*/configs/*" ! -path "*/.github/*" ! -path "*/.gitlab/*" ! -path "*/docker/open5gs/*" ! -name "FindBackward.cmake" \
19+
-print0 | while IFS= read -r -d '' file; do
20+
21+
# Check header format
22+
found_header=false
23+
while IFS= read -r line; do
24+
if [ -z "$line" ] && [ "$found_header" = false ]; then
25+
continue # Ignore empty lines before first comment block
26+
elif [[ "$line" =~ ^#.*$ ]]; then
27+
found_header=true
28+
continue # This line start with #. Keep reading
29+
elif [[ -z "$line" ]]; then
30+
break # Empty line after the header block. The format is valid and exit.
31+
else
32+
echo "$file: Header (or empty line after it) is missing."
33+
exit 1
34+
fi
35+
done <"$file"
36+
37+
# Replace header
38+
perl -0777 -pi -e "s/#[^!][\s\S]*?(?=\n.*?=|\n\n)/#
39+
# Copyright 2021-$(date +%Y) Software Radio Systems Limited
40+
#
41+
# This file is part of srsRAN
42+
#
43+
# srsRAN is free software: you can redistribute it and\/or modify
44+
# it under the terms of the GNU Affero General Public License as
45+
# published by the Free Software Foundation, either version 3 of
46+
# the License, or (at your option) any later version.
47+
#
48+
# srsRAN is distributed in the hope that it will be useful,
49+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
50+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51+
# GNU Affero General Public License for more details.
52+
#
53+
# A copy of the GNU Affero General Public License can be found in
54+
# the LICENSE file in the top-level directory of this distribution
55+
# and at http:\/\/www.gnu.org\/licenses\/.
56+
#/" "$file"
57+
58+
done
59+
60+
# for actual source and header files
61+
find . -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.h.in" \) \
62+
! -path "*/external/*" ! -name "rfnoc_test.cc" \
63+
-exec perl -0777 -pi -e "s{/\*.*?\*/}{/*
64+
*
65+
* Copyright 2021-$(date +%Y) Software Radio Systems Limited
66+
*
67+
* This file is part of srsRAN.
68+
*
69+
* srsRAN is free software: you can redistribute it and/or modify
70+
* it under the terms of the GNU Affero General Public License as
71+
* published by the Free Software Foundation, either version 3 of
72+
* the License, or (at your option) any later version.
73+
*
74+
* srsRAN is distributed in the hope that it will be useful,
75+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
76+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77+
* GNU Affero General Public License for more details.
78+
*
79+
* A copy of the GNU Affero General Public License can be found in
80+
* the LICENSE file in the top-level directory of this distribution
81+
* and at http://www.gnu.org/licenses/.
82+
*
83+
*/}s" {} \;

‎.gitlab/ci/schedules.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# and at http://www.gnu.org/licenses/.
1919
#
2020
Rebaser:
21-
cron: "*/10 6-23 * * 1-5"
21+
cron: "*/10 6-22 * * 1-5"
2222
cron_timezone: "Europe/Madrid"
2323
ref: dev
2424
active: true

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2021-2023 Software Radio Systems Limited
2+
# Copyright 2021-2024 Software Radio Systems Limited
33
#
44
# This file is part of srsRAN
55
#

0 commit comments

Comments
 (0)