Skip to content

[17148] Improve behavior when HAVE_STRICT_REALTIME is not set. (backport #3288)#3292

Merged
EduPonz merged 4 commits into2.1.xfrom
mergify/bp/2.1.x/pr-3288
May 12, 2023
Merged

[17148] Improve behavior when HAVE_STRICT_REALTIME is not set. (backport #3288)#3292
EduPonz merged 4 commits into2.1.xfrom
mergify/bp/2.1.x/pr-3288

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 10, 2023

This is an automatic backport of pull request #3288 done by Mergify.
Cherry-pick of 0cf43de has failed:

On branch mergify/bp/2.1.x/pr-3288
Your branch is up to date with 'origin/2.1.x'.

You are currently cherry-picking commit 0cf43de20.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/fastrtps/utils/TimedMutex.hpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/reader/RTPSReader.cpp
	modified:   src/cpp/rtps/resources/ResourceEvent.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #17148. Avoid try_lock_until on RTPSParticipantImpl.

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

* Refs #17148. Avoid try_lock_until on RTPSReader.

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

* Refs #17148. Avoid try_lock_until on ResourceEvent.

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

* Refs #17148. Using right clock on custom TimedMutex.

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

* Refs #17148. Avoid try_lock_until on DataReaderImpl.

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

---------

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

# Conflicts:
#	src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Feb 10, 2023
@MiguelCompany MiguelCompany added this to the v2.1.4 milestone Feb 10, 2023
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Apr 13, 2023
@MiguelCompany
Copy link
Copy Markdown
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Apr 13, 2023
@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima Please test this

1 similar comment
@JesusPoderoso
Copy link
Copy Markdown
Contributor

@richiprosima Please test this

@JesusPoderoso
Copy link
Copy Markdown
Contributor

@MiguelCompany this PR still has build conflicts 😢

@JesusPoderoso JesusPoderoso added conflicts Backport PR wich git cherry pick failed and removed ci-pending PR which CI is running labels Apr 20, 2023
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt jsan-rt added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels May 8, 2023
@jsan-rt
Copy link
Copy Markdown
Contributor

jsan-rt commented May 9, 2023

@richiprosima please test windows test mac

@jsan-rt jsan-rt removed the ci-pending PR which CI is running label May 9, 2023
@jsan-rt
Copy link
Copy Markdown
Contributor

jsan-rt commented May 11, 2023

Linux CI tested locally.

@jsan-rt jsan-rt added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label May 12, 2023
@EduPonz EduPonz merged commit 838777e into 2.1.x May 12, 2023
@EduPonz EduPonz deleted the mergify/bp/2.1.x/pr-3288 branch May 12, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants