Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mutex lock count on PDPListener [11861] #2020

Merged
merged 4 commits into from
Jun 24, 2021
Merged

Conversation

MiguelCompany
Copy link
Member

No description provided.

@MiguelCompany MiguelCompany changed the title Fix mutex lock count on PDPListener Fix mutex lock count on PDPListener [11861] Jun 23, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Copy link
Contributor

@MiguelBarro MiguelBarro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MiguelCompany MiguelCompany merged commit 392defc into master Jun 24, 2021
@MiguelCompany MiguelCompany deleted the bugfix/pdp-listener branch June 24, 2021 06:43
@MiguelCompany
Copy link
Member Author

@Mergifyio backport 2.2.x 2.1.x 2.0.x

mergify bot pushed a commit that referenced this pull request Jun 24, 2021
* Refs 11857. Added regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Fixed issue.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Bonus: fixed PDPServerListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Added comments on test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 392defc)
mergify bot pushed a commit that referenced this pull request Jun 24, 2021
* Refs 11857. Added regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Fixed issue.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Bonus: fixed PDPServerListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Added comments on test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 392defc)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
mergify bot pushed a commit that referenced this pull request Jun 24, 2021
* Refs 11857. Added regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Fixed issue.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Bonus: fixed PDPServerListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Added comments on test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 392defc)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
#	test/blackbox/CMakeLists.txt
#	test/blackbox/DDSBlackboxTestsDiscovery.cpp
@mergify
Copy link
Contributor

mergify bot commented Jun 24, 2021

Command backport 2.2.x 2.1.x 2.0.x: success

Backports have been created

MiguelCompany added a commit that referenced this pull request Jun 24, 2021
* Fix mutex lock count on PDPListener (#2020)

* Refs 11857. Added regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Fixed issue.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Bonus: fixed PDPServerListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Added comments on test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 392defc)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp

* Fix conflicts

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Linters

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Jun 24, 2021
* Fix mutex lock count on PDPListener (#2020)

* Refs 11857. Added regression test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Fixed issue.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Bonus: fixed PDPServerListener.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs 11857. Added comments on test.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 392defc)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
#	test/blackbox/CMakeLists.txt
#	test/blackbox/DDSBlackboxTestsDiscovery.cpp

* Fixed conflicts

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Linters

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Fix conflicts on CMakeLists.txt

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants