Skip to content

Commit 2c78c42

Browse files
mergify[bot]MiguelCompany
mergify[bot]
and
MiguelCompany
authored
Improvements in message receiver (#6184) (#6203)
* Improvements in message receiver (#6184) * Refs #23935. Small improvements in message receiver. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23935. Avoid copy initialization. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23965. Removing multiplatform actions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #23965. Use of CMAKE_CXX_FLAGS_INIT Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #23965. Fix documentation job Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #23965. Apply suggestions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Co-authored-by: Ricardo González Moreno <ricardo@richiware.dev> (cherry picked from commit 183eae3) # Conflicts: # .github/workflows/config/tsan.meta # .github/workflows/reusable-ubuntu-ci.yml # .github/workflows/reusable-windows-ci.yml # src/cpp/rtps/messages/MessageReceiver.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Add default colcon_args to sanitizers test Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
1 parent c047a31 commit 2c78c42

File tree

7 files changed

+107
-103
lines changed

7 files changed

+107
-103
lines changed

‎.github/workflows/config/asan.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ names:
55
- "-DSECURITY=ON"
66
- "-DFASTDDS_STATISTICS=ON"
77
- "-DSANITIZER=Address"
8-
- "-DCMAKE_CXX_FLAGS='-Werror'"
8+
- "-DCMAKE_CXX_FLAGS_INIT='-Werror'"
99
discovery-server:
1010
cmake-args:
1111
- "-DSANITIZER=Address"

‎.github/workflows/config/tsan.meta‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
names:
22
fastcdr:
33
cmake-args:
4-
- "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
5-
- "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
4+
- "-DCMAKE_C_FLAGS_INIT='-fsanitize=thread -fno-omit-frame-pointer'"
5+
- "-DCMAKE_CXX_FLAGS_INIT='-fsanitize=thread -fno-omit-frame-pointer'"
66
fastrtps:
77
cmake-args:
88
- "-DCOMPILE_EXAMPLES=OFF"
@@ -14,8 +14,8 @@ names:
1414
- "-DNO_TLS=OFF"
1515
- "-DSECURITY=ON"
1616
- "-DFASTDDS_STATISTICS=ON"
17-
- "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
18-
- "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
17+
- "-DCMAKE_C_FLAGS_INIT='-fsanitize=thread -fno-omit-frame-pointer'"
18+
- "-DCMAKE_CXX_FLAGS_INIT='-fsanitize=thread -fno-omit-frame-pointer'"
1919
googletest-distribution:
2020
cmake-args:
2121
- "-Dgtest_force_shared_crt=ON"

‎.github/workflows/reusable-mac-ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ jobs:
8080
upgrade: false
8181

8282
- name: Install colcon
83-
uses: eProsima/eProsima-CI/multiplatform/install_colcon@v0
83+
uses: eProsima/eProsima-CI/macos/install_colcon@v0
8484

8585
- name: Install Python dependencies
86-
uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0
86+
uses: eProsima/eProsima-CI/macos/install_python_packages@v0
8787
with:
8888
packages: vcstool xmlschema
8989
upgrade: false
@@ -112,14 +112,14 @@ jobs:
112112
ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
113113

114114
- name: Fetch Fast DDS dependencies
115-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
115+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
116116
with:
117117
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
118118
destination_workspace: src
119119
skip_existing: 'true'
120120

121121
- name: Fetch Fast DDS CI dependencies
122-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
122+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
123123
with:
124124
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.repos
125125
destination_workspace: src
@@ -131,12 +131,12 @@ jobs:
131131
# - Not working solution: https://github.com/macports/macports-ports/pull/21839/files
132132
- name: Colcon build
133133
continue-on-error: false
134-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
134+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
135135
with:
136136
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build.meta ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
137137
colcon_build_args: ${{ inputs.colcon-args }}
138138
cmake_args: ${{ inputs.cmake-args }}
139-
cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wno-enum-constexpr-conversion"
139+
cmake_args_default: -DCMAKE_CXX_FLAGS_INIT="-Werror -Wall -Wno-enum-constexpr-conversion"
140140
cmake_build_type: ${{ matrix.cmake-build-type }}
141141
workspace: ${{ github.workspace }}
142142

@@ -192,11 +192,11 @@ jobs:
192192

193193
- name: Install colcon
194194
if: ${{ inputs.run-tests == true }}
195-
uses: eProsima/eProsima-CI/multiplatform/install_colcon@v0
195+
uses: eProsima/eProsima-CI/macos/install_colcon@v0
196196

197197
- name: Install Python dependencies
198198
if: ${{ inputs.run-tests == true }}
199-
uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0
199+
uses: eProsima/eProsima-CI/macos/install_python_packages@v0
200200
with:
201201
packages: vcstool xmlschema psutil
202202
upgrade: false
@@ -217,7 +217,7 @@ jobs:
217217
- name: Colcon test
218218
if: ${{ inputs.run-tests == true }}
219219
id: test
220-
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
220+
uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
221221
with:
222222
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
223223
colcon_test_args: ${{ inputs.colcon-args }}
@@ -228,7 +228,7 @@ jobs:
228228
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}
229229

230230
- name: Test summary
231-
uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0
231+
uses: eProsima/eProsima-CI/ubuntu/junit_summary@v0
232232
if: ${{ !cancelled() && inputs.run-tests == true }}
233233
with:
234234
junit_reports_dir: "${{ steps.test.outputs.ctest_results_path }}"

‎.github/workflows/reusable-sanitizers-ci.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ jobs:
111111
ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
112112

113113
- name: Fetch Fast DDS dependencies
114-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
114+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
115115
with:
116116
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
117117
destination_workspace: src
118118
skip_existing: 'true'
119119

120120
- name: Fetch Fast DDS CI dependencies
121-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
121+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
122122
with:
123123
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.repos
124124
destination_workspace: src
@@ -131,7 +131,7 @@ jobs:
131131
132132
- name: Colcon build
133133
continue-on-error: false
134-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
134+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
135135
with:
136136
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.meta
137137
colcon_build_args: ${{ inputs.colcon_build_args }}
@@ -206,7 +206,7 @@ jobs:
206206
207207
- name: Colcon build
208208
continue-on-error: false
209-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
209+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
210210
with:
211211
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.meta
212212
colcon_build_args: ${{ inputs.colcon_build_args }}
@@ -219,8 +219,9 @@ jobs:
219219
- name: Colcon test
220220
id: test
221221
continue-on-error: true
222-
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
222+
uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
223223
with:
224+
colcon_args_default: ''
224225
colcon_test_args: ${{ inputs.colcon_test_args }}
225226
colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
226227
ctest_args: ${{ inputs.ctest_args }}
@@ -304,7 +305,7 @@ jobs:
304305
305306
- name: Colcon build
306307
continue-on-error: false
307-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
308+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
308309
with:
309310
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.meta
310311
colcon_build_args: ${{ inputs.colcon_build_args }}
@@ -317,8 +318,9 @@ jobs:
317318
- name: Colcon test
318319
id: test
319320
continue-on-error: true
320-
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
321+
uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
321322
with:
323+
colcon_args_default: ''
322324
colcon_test_args: ${{ inputs.colcon_test_args }}
323325
colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
324326
ctest_args: ${{ inputs.ctest_args }}
@@ -417,7 +419,7 @@ jobs:
417419
ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
418420

419421
- name: Fetch Fast DDS dependencies
420-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
422+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
421423
with:
422424
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
423425
destination_workspace: src
@@ -436,7 +438,7 @@ jobs:
436438
sudo echo "ff1e::ffff:efff:1 acme.org.test" | sudo tee -a /etc/hosts
437439
438440
- name: Fetch Fast DDS CI dependencies
439-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
441+
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
440442
with:
441443
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.repos
442444
destination_workspace: src
@@ -449,21 +451,22 @@ jobs:
449451
450452
- name: Colcon build
451453
continue-on-error: false
452-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
454+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
453455
with:
454456
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/tsan.meta
455457
colcon_build_args: ${{ inputs.colcon_build_args }}
456458
cmake_args: ${{ inputs.cmake_args }}
457459
cmake_args_default: ''
458-
cmake_build_type: 'Debug'
460+
cmake_build_type: 'RelWithDebInfo'
459461
workspace: ${{ github.workspace }}
460462
workspace_dependencies: ''
461463

462464
- name: Colcon test
463465
id: test
464466
continue-on-error: true
465-
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
467+
uses: eProsima/eProsima-CI/ubuntu/colcon_test@v0
466468
with:
469+
colcon_args_default: ''
467470
colcon_test_args: ${{ inputs.colcon_test_args }}
468471
colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
469472
ctest_args: ${{ inputs.ctest_args }}

0 commit comments

Comments
 (0)