Skip to content

Commit

Permalink
Update main
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
codebot authored and asaezper committed Oct 19, 2023
2 parents 5e6f50a + b9dbe65 commit 99d51c7
Show file tree
Hide file tree
Showing 596 changed files with 18,663 additions and 8,435 deletions.
85 changes: 46 additions & 39 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,49 +1,56 @@
---
# All Clang-Tidy Checks allowed, except:
# - forbidden vararg
# - forbidden magic numbers
# - forbidden namespace "using"
# - forbidden array->pointer decay
# - init of static memory may cause an exception (cert-err58)
# - forbidden implicit conversion from pointer/int to bool
# - recommended auto
# - remove llvm-specific checks (header guard style, usage of llvm namespace, restriction of libc includes, etc.)
# Naming conventions set to snake_case
Checks: '*,-fuchsia-*,
-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,
-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,
-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-static-cast-downcast,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-special-member-functions,
-cppcoreguidelines-avoid-do-while,
-modernize-use-using,-modernize-use-trailing-return-type,
-modernize-use-auto,-hicpp-use-auto,
-llvmlibc-callee-namespace,-llvmlibc-implementation-in-namespace,-llvmlibc-restrict-system-libc-headers,
-llvm-header-guard,-llvmlibc-inline-function-decl,
-bugprone-easily-swappable-parameters,
-google-runtime-references,-google-readability-casting,-google-build-using-namespace,
-google-readability-avoid-underscore-in-googletest-name,
google-default-arguments,-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cert-err58-cpp,
-altera-unroll-loops,-altera-id-dependent-backward-branch,
-readability-function-cognitive-complexity,-readability-isolate-declaration,
-misc-non-private-member-variables-in-classes,-altera-struct-pack-align,-readability-uppercase-literal-suffix,
Checks: '-*,
bugprone-copy-constructor-init,
bugprone-forward-declaration-namespace,
bugprone-inaccurate-erase,
bugprone-move-forwarding-reference,
bugprone-parent-virtual-call,
bugprone-reserved-identifier,
bugprone-suspicious-memset-usage,
bugprone-suspicious-semicolon,
bugprone-undefined-memory-manipulation,
bugprone-use-after-move,
cppcoreguidelines-macro-usage,
cppcoreguidelines-missing-std-forward,
cppcoreguidelines-pro-type-cstyle-cast,
cppcoreguidelines-slicing,
cppcoreguidelines-virtual-class-destructor,
llvm-namespace-comment,
misc-*,
-misc-const-correctness,
-misc-no-recursion,
-misc-unused-parameters,
-misc-use-anonymous-namespace,
-hicpp-special-member-functions,
-misc-non-private-member-variables-in-classes,
modernize-*,
-modernize-avoid-c-arrays,
-modernize-use-trailing-return-type,
performance-*,
readability-*,
-readability-avoid-unconditional-preprocessor-if,
-readability-function-cognitive-complexity,
-readability-function-size,
-readability-identifier-length,
readability-identifier-naming'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
-readability-implicit-bool-conversion,
-readability-magic-numbers,
-readability-static-accessed-through-instance,
-readability-uppercase-literal-suffix'
CheckOptions:
- key: readability-identifier-naming.NamespaceCase
value: lower_case
- key: readability-identifier-naming.ClassCase
value: lower_case
- key: readability-identifier-naming.EnumCase
value: lower_case
- key: readability-identifier-naming.FunctionCase
value: lower_case
- key: readability-identifier-naming.MemberCase
value: lower_case
- key: readability-identifier-naming.NamespaceCase
value: lower_case
- key: readability-identifier-naming.StructCase
value: lower_case
- key: readability-identifier-naming.VariableCase
value: lower_case
- key: readability-identifier-naming.StaticConstantCase
value: aNy_CasE
- key: readability-identifier-naming.GlobalConstantCase
value: aNy_CasE
78 changes: 34 additions & 44 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@

include:
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/setup/all.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/features/all.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/tools/python.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/tools/test_reporter.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/tools/tagger.yml
- local: .gitlab/ci/builders/version.yml
- local: .gitlab/ci/build.yml
Expand Down Expand Up @@ -140,7 +140,7 @@ full-code-format:
- static-analyzer.sh -i /tmp/codechecker_skip --analyzers ${ANALYZER} ${ANALYZER_ARGS} $CI_PROJECT_DIR
after_script:
- mv codechecker_html codechecker-${ANALYZER}-html
artifacts:
artifacts: &codechecker_artifacts
reports:
codequality: code-quality-report.json
paths:
Expand All @@ -159,7 +159,7 @@ clang-tidy:
allow_failure: false
variables:
ANALYZER: clang-tidy
ANALYZER_ARGS: --tidy-config .clang-tidy
ANALYZER_ARGS: --analyzer-config clang-tidy:take-config-from-directory=true --tidy-config .clang-tidy
ARTIFACT_EXTRA_PATH: "/index.html"

cppcheck:
Expand All @@ -170,6 +170,9 @@ cppcheck:
variables:
ANALYZER: cppcheck
ANALYZER_ARGS: --cppcheck-max-template-recursion 10
artifacts:
<<: *codechecker_artifacts
expire_in: 1 day

clangsa:
extends: .codechecker
Expand Down Expand Up @@ -203,12 +206,12 @@ clangsa:
cov-build --dir cov-int make -j${KUBERNETES_CPU_REQUEST}
tar czvf srsgnb.tgz cov-int
ver=$(git rev-parse HEAD)
- |
curl --form token=$COV_TOKEN \
--form email=[email protected] \
--form email=${COVERITY_EMAIL} \
--form [email protected] \
--form version=$ver \
--form description="srsRAN Project dev build" \
--form description="${DESCRIPTION}" \
https://scan.coverity.com/builds?project=${PROJECT_NAME}
coverity-dev:
Expand Down Expand Up @@ -280,11 +283,6 @@ unit coverage:
coverage_report: summary
when: always # Even if previous stages/required jobs fail
allow_failure: true
- if: $CI_DESCRIPTION =~ /Nightly/
variables:
coverage_report: full
when: always # Even if previous stages/required jobs fail
allow_failure: true
before_script:
- 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
# Download coverage history from the registry
Expand Down Expand Up @@ -329,10 +327,11 @@ unit coverage:
- pip3 install --verbose retina-reporter --index-url https://__token__:[email protected]/api/v4/projects/44296988/packages/pypi/simple
- retina-reporter --input build_time_metrics.json --bucket ci --db-config token=$INFLUXDB_TOKEN org=$INFLUXDB_ORG url=$INFLUXDB_URL
coverage: /^\s*Line coverage:\s*\d+.\d+\%/
artifacts:
artifacts: &unit_coverage_artifacts
paths:
- coverage_html
expire_in: 10 minutes
retry: 2
needs:
- job: smoke release cached
optional: true
Expand All @@ -344,29 +343,41 @@ unit coverage:
optional: true
artifacts: true

unit coverage dev:
extends: unit coverage
rules:
- if: $CI_DESCRIPTION =~ /Nightly/
variables:
coverage_report: full
when: always # Even if previous stages/required jobs fail
allow_failure: true
artifacts:
<<: *unit_coverage_artifacts
expire_in: 1 day

pages:
stage: documentation
rules:
- if: $CI_DESCRIPTION == "Nightly"
when: always # Even if previous stages/required jobs fail
allow_failure: true
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:2.0.0
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7
script:
- mkdir public
- mv coverage_html public/
- mv codechecker*html public/
- mv docs/index.html public/index.html
- .gitlab/ci/builders/install_dependencies.sh
- apt-get update && apt-get install -y --no-install-recommends rsync
- |
rm -Rf build
mkdir build
cd build || exit
cmake -G Ninja ..
ninja doxygen
mv ./docs/html ./public
cmake ..
make -j $(nproc) doxygen
cd ..
- mv build/public/index.html build/public/index_doxygen.html
- find build/public/ -name '*.*' -exec mv {} public/ \;
- mkdir public/doxygen
- rsync -a build/docs/html/ public/doxygen/
after_script:
- |
if [ $CI_JOB_STATUS = "failed" ]; then
Expand All @@ -375,32 +386,11 @@ pages:
fi
- mv docs/*.png public/
- sed -i 's/commit_hash/'$CI_COMMIT_SHA'/' public/index.html
- sed -i 's/zmq_job_id/'$( cat ./zmq/job.env )'/' public/index.html
- sed -i 's/zmq_asan_job_id/'$( cat ./zmq-asan/job.env )'/' public/index.html
- sed -i 's/zmq_valgrind_job_id/'$( cat ./zmq-valgrind/job.env )'/' public/index.html
- sed -i 's/rf_job_id/'$( cat ./rf/job.env )'/' public/index.html
- sed -i 's/rf_tsan_job_id/'$( cat ./rf-tsan/job.env )'/' public/index.html
- sed -i 's/rf_asan_job_id/'$( cat ./rf-asan/job.env )'/' public/index.html
- sed -i 's/rf_b200_config_job_id/'$( cat ./rf-b200-config/job.env )'/' public/index.html
needs:
- job: unit coverage
- job: unit coverage dev
artifacts: true
- job: cppcheck
artifacts: true
- job: zmq
artifacts: true
- job: zmq-asan
artifacts: true
- job: zmq-valgrind
artifacts: true
- job: rf
artifacts: true
- job: rf-tsan
artifacts: true
- job: rf-asan
artifacts: true
- job: rf-b200-config
artifacts: true
artifacts:
paths:
- public
Expand Down
19 changes: 17 additions & 2 deletions .gitlab/ci/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

include:
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/setup/all.yml
- project: softwareradiosystems/ci/srsran_project_packaging
ref: "1"
Expand Down Expand Up @@ -293,7 +293,7 @@ variables:
rm -Rf build_time_metrics.json
fi
timeout: 4h
artifacts:
artifacts: &build_artifacts
when: always
reports:
coverage_report:
Expand Down Expand Up @@ -552,6 +552,9 @@ smoke release update cache:
cache:
- !reference [.fetch_src_cache, cache]
- *cache_build_set
artifacts:
<<: *build_artifacts
expire_in: 1 day

smoke tsan update cache:
extends: .smoke tsan
Expand All @@ -566,6 +569,9 @@ smoke tsan update cache:
cache:
- !reference [.fetch_src_cache, cache]
- *cache_build_set
artifacts:
<<: *build_artifacts
expire_in: 1 day

smoke rhel update cache:
extends: .smoke rhel
Expand Down Expand Up @@ -607,6 +613,9 @@ basic rel with deb info:
ENABLE_AVX512: "False"
SAVE_ARTIFACTS: "True"
tags: ["${AMD64_AVX2_TAG}"]
artifacts:
<<: *build_artifacts
expire_in: 1 day

basic asan:
extends: .build_and_unit
Expand All @@ -625,6 +634,9 @@ basic asan:
ENABLE_AVX512: "False"
SAVE_ARTIFACTS: "True"
tags: ["${AMD64_AVX2_TAG}"]
artifacts:
<<: *build_artifacts
expire_in: 1 day

basic valgrind:
extends: .build_and_unit
Expand All @@ -642,6 +654,9 @@ basic valgrind:
TEST_MODE: valgrind
SAVE_ARTIFACTS: "True"
tags: ["${AMD64_TAG}"]
artifacts:
<<: *build_artifacts
expire_in: 1 day

# Packaging

Expand Down
8 changes: 4 additions & 4 deletions .gitlab/ci/builders.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
include:
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/setup/default.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/setup/workflow.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/tools/docker.yml
- project: softwareradiosystems/ci/tools
ref: "12"
ref: "13"
file: .gitlab/ci-shared/setup/versions.yml
- local: .gitlab/ci/builders/version.yml
- local: .gitlab/ci/src_cache.yml
Expand Down
Loading

0 comments on commit 99d51c7

Please sign in to comment.