Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eProsima/Fast-DDS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 428a2725485bc7efb2bdd925f53d6af48232042e
Choose a base ref
..
head repository: eProsima/Fast-DDS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd13569d3abf2924ff3e7aeffb6a3d29a72394a6
Choose a head ref
Showing with 2,075 additions and 733 deletions.
  1. +3 −4 .github/pull_request_template.md
  2. +2 −2 .github/workflows/documentation-tests.yaml
  3. +1 −1 .github/workflows/mac-ci.yml
  4. +23 −1 .github/workflows/mirror.yml
  5. +14 −14 .github/workflows/nightly-mac-ci.yml
  6. +18 −18 .github/workflows/nightly-sanitizers-ci.yml
  7. +16 −16 .github/workflows/nightly-ubuntu-ci.yml
  8. +14 −14 .github/workflows/nightly-windows-ci.yml
  9. +0 −47 .github/workflows/rebase-3.0.x-devel.yaml
  10. +1 −1 .github/workflows/reusable-sanitizers-ci.yml
  11. +23 −0 .github/workflows/reusable-ubuntu-ci.yml
  12. +2 −2 .github/workflows/sanitizers-ci.yml
  13. +1 −1 .github/workflows/ubuntu-ci.yml
  14. +1 −1 .github/workflows/windows-ci.yml
  15. +4 −4 README.md
  16. +1 −15 fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx
  17. +0 −61 fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx
  18. +0 −16 fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h
  19. +2 −2 include/fastdds/dds/publisher/Publisher.hpp
  20. +1 −0 include/fastdds/dds/publisher/qos/DataWriterQos.hpp
  21. +6 −4 include/fastdds/dds/subscriber/DataReader.hpp
  22. +1 −0 include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
  23. +1 −0 resources/xsd/fastdds_profiles.xsd
  24. +3 −3 src/cpp/fastdds/core/policy/ParameterList.cpp
  25. +27 −8 src/cpp/fastdds/publisher/DataWriterImpl.cpp
  26. +5 −0 src/cpp/fastdds/publisher/DataWriterImpl.hpp
  27. +2 −7 src/cpp/fastdds/publisher/Publisher.cpp
  28. +19 −9 src/cpp/fastdds/publisher/PublisherImpl.cpp
  29. +5 −5 src/cpp/fastdds/publisher/PublisherImpl.hpp
  30. +1 −0 src/cpp/fastdds/publisher/qos/DataWriterQos.cpp
  31. +50 −7 src/cpp/fastdds/subscriber/DataReaderImpl.cpp
  32. +6 −1 src/cpp/fastdds/subscriber/DataReaderImpl.hpp
  33. +9 −6 src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
  34. +1 −6 src/cpp/fastdds/subscriber/Subscriber.cpp
  35. +18 −9 src/cpp/fastdds/subscriber/SubscriberImpl.cpp
  36. +4 −5 src/cpp/fastdds/subscriber/SubscriberImpl.hpp
  37. +14 −2 src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
  38. +1 −0 src/cpp/fastdds/subscriber/qos/DataReaderQos.cpp
  39. +7 −5 src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp
  40. +35 −7 src/cpp/rtps/builtin/data/ReaderProxyData.cpp
  41. +29 −14 src/cpp/rtps/builtin/data/WriterProxyData.cpp
  42. +4 −1 src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
  43. +4 −0 src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
  44. +7 −0 src/cpp/rtps/builtin/discovery/participant/PDP.h
  45. +4 −7 src/cpp/rtps/network/NetworkFactory.cpp
  46. +10 −13 src/cpp/rtps/network/NetworkFactory.h
  47. +148 −106 src/cpp/rtps/participant/RTPSParticipantImpl.cpp
  48. +7 −0 src/cpp/rtps/participant/RTPSParticipantImpl.h
  49. +14 −1 src/cpp/rtps/security/SecurityManager.cpp
  50. +7 −1 src/cpp/rtps/security/SecurityManager.h
  51. +0 −3 src/cpp/rtps/transport/TCPTransportInterface.cpp
  52. +16 −60 src/cpp/statistics/rtps/monitor-service/MonitorService.cpp
  53. +0 −1 src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp
  54. +27 −17 src/cpp/utils/threading.hpp
  55. +7 −0 src/cpp/utils/threading/threading_empty.ipp
  56. +54 −29 src/cpp/utils/threading/threading_osx.ipp
  57. +52 −25 src/cpp/utils/threading/threading_pthread.ipp
  58. +19 −10 src/cpp/utils/threading/threading_win32.ipp
  59. +91 −16 src/cpp/xmlparser/XMLDynamicParser.cpp
  60. +14 −0 src/cpp/xmlparser/XMLProfileManager.cpp
  61. +1 −38 src/cpp/xmlparser/XMLProfileManager.h
  62. +7 −0 test/blackbox/api/dds-pim/PubSubWriter.hpp
  63. +113 −0 test/blackbox/common/BlackboxTestsSecurity.cpp
  64. +8 −4 test/blackbox/common/BlackboxTestsTransportSHM.cpp
  65. +227 −1 test/blackbox/common/DDSBlackboxTestsDataReader.cpp
  66. +103 −1 test/blackbox/common/DDSBlackboxTestsDataWriter.cpp
  67. +99 −0 test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp
  68. +10 −4 test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
  69. +8 −0 test/system/tools/xmlvalidation/XMLTesterExample_profile.xml
  70. +8 −0 test/system/tools/xmlvalidation/all_profile.xml
  71. +8 −0 test/system/tools/xmlvalidation/types_profile.xml
  72. +6 −0 test/unittest/dds/participant/ParticipantTests.cpp
  73. +94 −0 test/unittest/dds/publisher/DataWriterTests.cpp
  74. +92 −6 test/unittest/dds/publisher/PublisherTests.cpp
  75. +247 −54 test/unittest/dds/subscriber/DataReaderTests.cpp
  76. +105 −5 test/unittest/dds/subscriber/SubscriberTests.cpp
  77. +24 −0 test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp
  78. +27 −2 test/unittest/rtps/security/SecurityTests.cpp
  79. +5 −1 test/unittest/rtps/security/SecurityTests.hpp
  80. +12 −0 test/unittest/rtps/security/SecurityValidationRemoteTests.cpp
  81. +1 −0 test/unittest/xmlparser/XMLParserTests.cpp
  82. +0 −8 test/unittest/xmlparser/XMLProfileParserTests.cpp
  83. +13 −0 test/unittest/xmlparser/regressions/20732_profile_bin.xml
  84. +1 −1 versions.md
7 changes: 3 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
Please uncomment following line, adjusting the corresponding target branches for the backport.
-->
<!-- @Mergifyio backport 2.13.x 2.10.x 2.6.x -->
<!-- @Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x -->

<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
<!-- Fixes #(issue) -->
@@ -32,8 +32,8 @@
## Contributor Checklist

<!--
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_
- If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox with ❌ or __NO__.
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
- If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox [ ] with ❌: or __NO__:.
-->

- [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. Fast DDS developers must also refer to the internal Redmine task. -->
@@ -48,7 +48,6 @@
<!-- - Related documentation PR: eProsima/Fast-DDS-docs#(PR) -->
- [ ] Applicable backports have been included in the description.


## Reviewer Checklist

- [ ] The PR has a milestone assigned.
4 changes: 2 additions & 2 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ jobs:
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
with:
remote_repository: eProsima/Fast-DDS-python
fallback_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
fallback_branch: ${{ inputs.fastdds_python_branch || 'main' }}

- name: Download Fast DDS Python repo
uses: eProsima/eProsima-CI/external/checkout@v0
@@ -104,7 +104,7 @@ jobs:
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
with:
remote_repository: eProsima/Fast-DDS-docs
fallback_branch: ${{ inputs.fastdds_docs_branch || '3.0.x-devel' }}
fallback_branch: ${{ inputs.fastdds_docs_branch || 'master' }}

- name: Download Fast DDS documentation repo
uses: eProsima/eProsima-CI/external/checkout@v0
2 changes: 1 addition & 1 deletion .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
@@ -48,4 +48,4 @@ jobs:
colcon-args: ${{ inputs.colcon-args }}
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
ctest-args: ${{ inputs.ctest-args }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
24 changes: 23 additions & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
@@ -3,15 +3,19 @@ on:
push:
branches:
- 'master'
- '2.14.x'

jobs:
mirror_job:
mirror_job_master:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
name: Mirror master branch to API & ABI compatible minor version branches
strategy:
fail-fast: false
matrix:
dest_branch:
- '3.0.x'
- '3.x'
steps:
- name: Mirror action step
id: mirror
@@ -20,3 +24,21 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
source: 'master'
dest: ${{ matrix.dest_branch }}

mirror_job_2_x:
if: github.ref == 'refs/heads/2.14.x'
runs-on: ubuntu-latest
name: Mirror master branch to API & ABI compatible minor version branches
strategy:
fail-fast: false
matrix:
dest_branch:
- '2.x'
steps:
- name: Mirror action step
id: mirror
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
source: '2.14.x'
dest: ${{ matrix.dest_branch }}
28 changes: 14 additions & 14 deletions .github/workflows/nightly-mac-ci.yml
Original file line number Diff line number Diff line change
@@ -20,6 +20,20 @@ jobs:
ctest-args: "-LE xfail"
fastdds-branch: 'master'

nightly-mac-ci-2_14_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.14.x
with:
label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '2.14.x'

nightly-mac-ci-2_13_x:
strategy:
fail-fast: false
@@ -61,17 +75,3 @@ jobs:
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '2.6.x'

nightly-mac-ci-3_0_x-devel:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x-devel
with:
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x-devel'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '3.0.x-devel'
36 changes: 18 additions & 18 deletions .github/workflows/nightly-sanitizers-ci.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:

jobs:
nightly-sanitizers-ci-master:
uses: ./.github/workflows/reusable-sanitizers-ci.yml
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@master
with:
label: 'nightly-sec-sanitizers-ci-master'
run_asan_fastdds: true
@@ -20,8 +20,22 @@ jobs:
fastdds_ref: 'master'
discovery_server_ref: 'master'

nightly-sanitizers-ci-2_14_x:
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
with:
label: 'nightly-sec-sanitizers-ci-2.14.x'
run_asan_fastdds: true
run_asan_discovery_server: true
run_tsan_fastdds: true
colcon_build_args: ''
colcon_test_args: ''
cmake_args: ''
ctest_args: ''
fastdds_ref: '2.14.x'
discovery_server_ref: 'v1.2.2'

nightly-sanitizers-ci-2_13_x:
uses: ./.github/workflows/reusable-sanitizers-ci.yml
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.13.x
with:
label: 'nightly-sec-sanitizers-ci-2.13.x'
run_asan_fastdds: true
@@ -35,7 +49,7 @@ jobs:
discovery_server_ref: 'v1.2.2'

nightly-sanitizers-ci-2_10_x:
uses: ./.github/workflows/reusable-sanitizers-ci.yml
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.10.x
with:
label: 'nightly-sec-sanitizers-ci-2.10.x'
run_asan_fastdds: true
@@ -49,7 +63,7 @@ jobs:
discovery_server_ref: 'v1.2.1'

nightly-sanitizers-ci-2_6_x:
uses: ./.github/workflows/reusable-sanitizers-ci.yml
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.6.x
with:
label: 'nightly-sec-sanitizers-ci-2.6.x'
run_asan_fastdds: true
@@ -61,17 +75,3 @@ jobs:
ctest_args: ''
fastdds_ref: '2.6.x'
discovery_server_ref: 'v1.2.1'

nightly-sanitizers-ci-3_0_x-devel:
uses: ./.github/workflows/reusable-sanitizers-ci.yml
with:
label: 'nightly-sec-sanitizers-ci-3.0.x-devel'
run_asan_fastdds: true
run_asan_discovery_server: true
run_tsan_fastdds: true
colcon_build_args: ''
colcon_test_args: ''
cmake_args: ''
ctest_args: ''
fastdds_ref: '3.0.x-devel'
discovery_server_ref: '3.0.x-devel'
32 changes: 16 additions & 16 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ jobs:
ctest-args: "-LE xfail"
fastdds-branch: 'master'

nightly-ubuntu-ci-2_13_x:
nightly-ubuntu-ci-2_14_x:
strategy:
fail-fast: false
matrix:
@@ -32,15 +32,15 @@ jobs:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '2.13.x'
fastdds-branch: '2.14.x'

nightly-ubuntu-ci-2_10_x:
nightly-ubuntu-ci-2_13_x:
strategy:
fail-fast: false
matrix:
@@ -49,15 +49,15 @@ jobs:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '2.10.x'
fastdds-branch: '2.13.x'

nightly-ubuntu-ci-2_6_x:
nightly-ubuntu-ci-2_10_x:
strategy:
fail-fast: false
matrix:
@@ -66,15 +66,15 @@ jobs:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '2.6.x'
fastdds-branch: '2.10.x'

nightly-ubuntu-ci-3_0_x-devel:
nightly-ubuntu-ci-2_6_x:
strategy:
fail-fast: false
matrix:
@@ -83,10 +83,10 @@ jobs:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x-devel
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x-devel'
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '3.0.x-devel'
fastdds-branch: '2.6.x'
28 changes: 14 additions & 14 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
@@ -20,6 +20,20 @@ jobs:
ctest-args: "-LE xfail"
fastdds_branch: 'master'

nightly-windows-ci-2_14_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.14.x
with:
label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.14.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds_branch: '2.14.x'

nightly-windows-ci-2_13_x:
strategy:
fail-fast: false
@@ -61,17 +75,3 @@ jobs:
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds_branch: '2.6.x'

nightly-windows-ci-3_0_x-devel:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x-devel
with:
label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x-devel'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds_branch: '3.0.x-devel'
47 changes: 0 additions & 47 deletions .github/workflows/rebase-3.0.x-devel.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/reusable-sanitizers-ci.yml
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ jobs:
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
colcon_build_args: ${{ inputs.colcon_build_args }}
cmake_args: ${{ inputs.cmake_args }}
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -Dfastdds_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
cmake_build_type: 'Debug'
workspace: ${{ github.workspace }}
workspace_dependencies: ''
Loading