Skip to content

Commit 99d51c7

Browse files
codebotasaezper
authored andcommitted
Update main
# Conflicts: # README.md # include/srsran/support/async/async_task_loop.h # include/srsran/support/executors/priority_multiqueue_task_worker.h # lib/ofh/receiver/ofh_uplane_uplink_packet_handler.cpp # lib/ofh/receiver/ofh_uplane_uplink_packet_handler.h # lib/ofh/receiver/ofh_uplane_uplink_symbol_manager.cpp # lib/ofh/receiver/ofh_uplane_uplink_symbol_manager.h # lib/ofh/support/uplink_context_repo.h # tests/unittests/mac/mac_dl_ue_manager_test.cpp # tests/unittests/phy/upper/channel_processors/pucch_processor_format1_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_processor_format2_test_data.tar.gz
2 parents 5e6f50a + b9dbe65 commit 99d51c7

File tree

596 files changed

+18663
-8435
lines changed

Some content is hidden

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

596 files changed

+18663
-8435
lines changed

.clang-tidy

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11
---
2-
# All Clang-Tidy Checks allowed, except:
3-
# - forbidden vararg
4-
# - forbidden magic numbers
5-
# - forbidden namespace "using"
6-
# - forbidden array->pointer decay
7-
# - init of static memory may cause an exception (cert-err58)
8-
# - forbidden implicit conversion from pointer/int to bool
9-
# - recommended auto
10-
# - remove llvm-specific checks (header guard style, usage of llvm namespace, restriction of libc includes, etc.)
11-
# Naming conventions set to snake_case
12-
Checks: '*,-fuchsia-*,
13-
-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,
14-
-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,
15-
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,
16-
-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-type-cstyle-cast,
17-
-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-static-cast-downcast,
18-
-cppcoreguidelines-macro-usage,
19-
-cppcoreguidelines-avoid-const-or-ref-data-members,
20-
-cppcoreguidelines-non-private-member-variables-in-classes,
21-
-cppcoreguidelines-special-member-functions,
22-
-cppcoreguidelines-avoid-do-while,
23-
-modernize-use-using,-modernize-use-trailing-return-type,
24-
-modernize-use-auto,-hicpp-use-auto,
25-
-llvmlibc-callee-namespace,-llvmlibc-implementation-in-namespace,-llvmlibc-restrict-system-libc-headers,
26-
-llvm-header-guard,-llvmlibc-inline-function-decl,
27-
-bugprone-easily-swappable-parameters,
28-
-google-runtime-references,-google-readability-casting,-google-build-using-namespace,
29-
-google-readability-avoid-underscore-in-googletest-name,
30-
google-default-arguments,-cppcoreguidelines-pro-bounds-pointer-arithmetic,
31-
-cert-err58-cpp,
32-
-altera-unroll-loops,-altera-id-dependent-backward-branch,
33-
-readability-function-cognitive-complexity,-readability-isolate-declaration,
34-
-misc-non-private-member-variables-in-classes,-altera-struct-pack-align,-readability-uppercase-literal-suffix,
2+
Checks: '-*,
3+
bugprone-copy-constructor-init,
4+
bugprone-forward-declaration-namespace,
5+
bugprone-inaccurate-erase,
6+
bugprone-move-forwarding-reference,
7+
bugprone-parent-virtual-call,
8+
bugprone-reserved-identifier,
9+
bugprone-suspicious-memset-usage,
10+
bugprone-suspicious-semicolon,
11+
bugprone-undefined-memory-manipulation,
12+
bugprone-use-after-move,
13+
cppcoreguidelines-macro-usage,
14+
cppcoreguidelines-missing-std-forward,
15+
cppcoreguidelines-pro-type-cstyle-cast,
16+
cppcoreguidelines-slicing,
17+
cppcoreguidelines-virtual-class-destructor,
18+
llvm-namespace-comment,
19+
misc-*,
20+
-misc-const-correctness,
21+
-misc-no-recursion,
22+
-misc-unused-parameters,
3523
-misc-use-anonymous-namespace,
36-
-hicpp-special-member-functions,
24+
-misc-non-private-member-variables-in-classes,
25+
modernize-*,
26+
-modernize-avoid-c-arrays,
27+
-modernize-use-trailing-return-type,
28+
performance-*,
29+
readability-*,
30+
-readability-avoid-unconditional-preprocessor-if,
31+
-readability-function-cognitive-complexity,
32+
-readability-function-size,
3733
-readability-identifier-length,
38-
readability-identifier-naming'
39-
HeaderFilterRegex: ''
40-
AnalyzeTemporaryDtors: false
34+
-readability-implicit-bool-conversion,
35+
-readability-magic-numbers,
36+
-readability-static-accessed-through-instance,
37+
-readability-uppercase-literal-suffix'
4138
CheckOptions:
42-
- key: readability-identifier-naming.NamespaceCase
43-
value: lower_case
4439
- key: readability-identifier-naming.ClassCase
4540
value: lower_case
41+
- key: readability-identifier-naming.EnumCase
42+
value: lower_case
43+
- key: readability-identifier-naming.FunctionCase
44+
value: lower_case
45+
- key: readability-identifier-naming.MemberCase
46+
value: lower_case
47+
- key: readability-identifier-naming.NamespaceCase
48+
value: lower_case
4649
- key: readability-identifier-naming.StructCase
4750
value: lower_case
4851
- key: readability-identifier-naming.VariableCase
4952
value: lower_case
53+
- key: readability-identifier-naming.StaticConstantCase
54+
value: aNy_CasE
55+
- key: readability-identifier-naming.GlobalConstantCase
56+
value: aNy_CasE

.gitlab-ci.yml

Lines changed: 34 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "12"
28+
ref: "13"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "12"
31+
ref: "13"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "12"
34+
ref: "13"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "12"
37+
ref: "13"
3838
file: .gitlab/ci-shared/tools/test_reporter.yml
3939
- project: softwareradiosystems/ci/tools
40-
ref: "12"
40+
ref: "13"
4141
file: .gitlab/ci-shared/tools/tagger.yml
4242
- local: .gitlab/ci/builders/version.yml
4343
- local: .gitlab/ci/build.yml
@@ -140,7 +140,7 @@ full-code-format:
140140
- static-analyzer.sh -i /tmp/codechecker_skip --analyzers ${ANALYZER} ${ANALYZER_ARGS} $CI_PROJECT_DIR
141141
after_script:
142142
- mv codechecker_html codechecker-${ANALYZER}-html
143-
artifacts:
143+
artifacts: &codechecker_artifacts
144144
reports:
145145
codequality: code-quality-report.json
146146
paths:
@@ -159,7 +159,7 @@ clang-tidy:
159159
allow_failure: false
160160
variables:
161161
ANALYZER: clang-tidy
162-
ANALYZER_ARGS: --tidy-config .clang-tidy
162+
ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
163163
ARTIFACT_EXTRA_PATH: "/index.html"
164164

165165
cppcheck:
@@ -170,6 +170,9 @@ cppcheck:
170170
variables:
171171
ANALYZER: cppcheck
172172
ANALYZER_ARGS: --cppcheck-max-template-recursion 10
173+
artifacts:
174+
<<: *codechecker_artifacts
175+
expire_in: 1 day
173176

174177
clangsa:
175178
extends: .codechecker
@@ -203,12 +206,12 @@ clangsa:
203206
cov-build --dir cov-int make -j${KUBERNETES_CPU_REQUEST}
204207
tar czvf srsgnb.tgz cov-int
205208
ver=$(git rev-parse HEAD)
206-
209+
- |
207210
curl --form token=$COV_TOKEN \
208-
--form email=[email protected] \
211+
--form email=${COVERITY_EMAIL} \
209212
210213
--form version=$ver \
211-
--form description="srsRAN Project dev build" \
214+
--form description="${DESCRIPTION}" \
212215
https://scan.coverity.com/builds?project=${PROJECT_NAME}
213216
214217
coverity-dev:
@@ -280,11 +283,6 @@ unit coverage:
280283
coverage_report: summary
281284
when: always # Even if previous stages/required jobs fail
282285
allow_failure: true
283-
- if: $CI_DESCRIPTION =~ /Nightly/
284-
variables:
285-
coverage_report: full
286-
when: always # Even if previous stages/required jobs fail
287-
allow_failure: true
288286
before_script:
289287
- PACKAGE_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/coverage/${CI_COMMIT_BRANCH}${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}/coverage_history.tar.gz
290288
# Download coverage history from the registry
@@ -329,10 +327,11 @@ unit coverage:
329327
- pip3 install --verbose retina-reporter --index-url https://__token__:[email protected]/api/v4/projects/44296988/packages/pypi/simple
330328
- retina-reporter --input build_time_metrics.json --bucket ci --db-config token=$INFLUXDB_TOKEN org=$INFLUXDB_ORG url=$INFLUXDB_URL
331329
coverage: /^\s*Line coverage:\s*\d+.\d+\%/
332-
artifacts:
330+
artifacts: &unit_coverage_artifacts
333331
paths:
334332
- coverage_html
335333
expire_in: 10 minutes
334+
retry: 2
336335
needs:
337336
- job: smoke release cached
338337
optional: true
@@ -344,29 +343,41 @@ unit coverage:
344343
optional: true
345344
artifacts: true
346345

346+
unit coverage dev:
347+
extends: unit coverage
348+
rules:
349+
- if: $CI_DESCRIPTION =~ /Nightly/
350+
variables:
351+
coverage_report: full
352+
when: always # Even if previous stages/required jobs fail
353+
allow_failure: true
354+
artifacts:
355+
<<: *unit_coverage_artifacts
356+
expire_in: 1 day
357+
347358
pages:
348359
stage: documentation
349360
rules:
350361
- if: $CI_DESCRIPTION == "Nightly"
351362
when: always # Even if previous stages/required jobs fail
352363
allow_failure: true
353-
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:2.0.0
364+
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7
354365
script:
355366
- mkdir public
356367
- mv coverage_html public/
357368
- mv codechecker*html public/
358369
- mv docs/index.html public/index.html
359370
- .gitlab/ci/builders/install_dependencies.sh
371+
- apt-get update && apt-get install -y --no-install-recommends rsync
360372
- |
361373
rm -Rf build
362374
mkdir build
363375
cd build || exit
364-
cmake -G Ninja ..
365-
ninja doxygen
366-
mv ./docs/html ./public
376+
cmake ..
377+
make -j $(nproc) doxygen
367378
cd ..
368-
- mv build/public/index.html build/public/index_doxygen.html
369-
- find build/public/ -name '*.*' -exec mv {} public/ \;
379+
- mkdir public/doxygen
380+
- rsync -a build/docs/html/ public/doxygen/
370381
after_script:
371382
- |
372383
if [ $CI_JOB_STATUS = "failed" ]; then
@@ -375,32 +386,11 @@ pages:
375386
fi
376387
- mv docs/*.png public/
377388
- sed -i 's/commit_hash/'$CI_COMMIT_SHA'/' public/index.html
378-
- sed -i 's/zmq_job_id/'$( cat ./zmq/job.env )'/' public/index.html
379-
- sed -i 's/zmq_asan_job_id/'$( cat ./zmq-asan/job.env )'/' public/index.html
380-
- sed -i 's/zmq_valgrind_job_id/'$( cat ./zmq-valgrind/job.env )'/' public/index.html
381-
- sed -i 's/rf_job_id/'$( cat ./rf/job.env )'/' public/index.html
382-
- sed -i 's/rf_tsan_job_id/'$( cat ./rf-tsan/job.env )'/' public/index.html
383-
- sed -i 's/rf_asan_job_id/'$( cat ./rf-asan/job.env )'/' public/index.html
384-
- sed -i 's/rf_b200_config_job_id/'$( cat ./rf-b200-config/job.env )'/' public/index.html
385389
needs:
386-
- job: unit coverage
390+
- job: unit coverage dev
387391
artifacts: true
388392
- job: cppcheck
389393
artifacts: true
390-
- job: zmq
391-
artifacts: true
392-
- job: zmq-asan
393-
artifacts: true
394-
- job: zmq-valgrind
395-
artifacts: true
396-
- job: rf
397-
artifacts: true
398-
- job: rf-tsan
399-
artifacts: true
400-
- job: rf-asan
401-
artifacts: true
402-
- job: rf-b200-config
403-
artifacts: true
404394
artifacts:
405395
paths:
406396
- public

.gitlab/ci/build.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
include:
2222
- project: softwareradiosystems/ci/tools
23-
ref: "12"
23+
ref: "13"
2424
file: .gitlab/ci-shared/setup/all.yml
2525
- project: softwareradiosystems/ci/srsran_project_packaging
2626
ref: "1"
@@ -293,7 +293,7 @@ variables:
293293
rm -Rf build_time_metrics.json
294294
fi
295295
timeout: 4h
296-
artifacts:
296+
artifacts: &build_artifacts
297297
when: always
298298
reports:
299299
coverage_report:
@@ -552,6 +552,9 @@ smoke release update cache:
552552
cache:
553553
- !reference [.fetch_src_cache, cache]
554554
- *cache_build_set
555+
artifacts:
556+
<<: *build_artifacts
557+
expire_in: 1 day
555558

556559
smoke tsan update cache:
557560
extends: .smoke tsan
@@ -566,6 +569,9 @@ smoke tsan update cache:
566569
cache:
567570
- !reference [.fetch_src_cache, cache]
568571
- *cache_build_set
572+
artifacts:
573+
<<: *build_artifacts
574+
expire_in: 1 day
569575

570576
smoke rhel update cache:
571577
extends: .smoke rhel
@@ -607,6 +613,9 @@ basic rel with deb info:
607613
ENABLE_AVX512: "False"
608614
SAVE_ARTIFACTS: "True"
609615
tags: ["${AMD64_AVX2_TAG}"]
616+
artifacts:
617+
<<: *build_artifacts
618+
expire_in: 1 day
610619

611620
basic asan:
612621
extends: .build_and_unit
@@ -625,6 +634,9 @@ basic asan:
625634
ENABLE_AVX512: "False"
626635
SAVE_ARTIFACTS: "True"
627636
tags: ["${AMD64_AVX2_TAG}"]
637+
artifacts:
638+
<<: *build_artifacts
639+
expire_in: 1 day
628640

629641
basic valgrind:
630642
extends: .build_and_unit
@@ -642,6 +654,9 @@ basic valgrind:
642654
TEST_MODE: valgrind
643655
SAVE_ARTIFACTS: "True"
644656
tags: ["${AMD64_TAG}"]
657+
artifacts:
658+
<<: *build_artifacts
659+
expire_in: 1 day
645660

646661
# Packaging
647662

.gitlab/ci/builders.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
include:
22
- project: softwareradiosystems/ci/tools
3-
ref: "12"
3+
ref: "13"
44
file: .gitlab/ci-shared/setup/default.yml
55
- project: softwareradiosystems/ci/tools
6-
ref: "12"
6+
ref: "13"
77
file: .gitlab/ci-shared/setup/workflow.yml
88
- project: softwareradiosystems/ci/tools
9-
ref: "12"
9+
ref: "13"
1010
file: .gitlab/ci-shared/tools/docker.yml
1111
- project: softwareradiosystems/ci/tools
12-
ref: "12"
12+
ref: "13"
1313
file: .gitlab/ci-shared/setup/versions.yml
1414
- local: .gitlab/ci/builders/version.yml
1515
- local: .gitlab/ci/src_cache.yml

0 commit comments

Comments
 (0)