Skip to content

fix: Improved thread usage under congestion (backport #3258) - #3261

Open
mergify[bot] wants to merge 1 commit into
jazzyfrom
mergify/bp/jazzy/pr-3258
Open

fix: Improved thread usage under congestion (backport #3258)#3261
mergify[bot] wants to merge 1 commit into
jazzyfrom
mergify/bp/jazzy/pr-3258

Conversation

@mergify

@mergify mergify Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

Description

Some improvements on thread wakeups

Fixes # (issue)

Is this user-facing behavior change?

no

Did you use Generative AI?

no

Additional Information


This is an automatic backport of pull request #3258 done by [Mergify](https://mergify.com).

Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>
Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com>
(cherry picked from commit c36e550)

# Conflicts:
#	rclcpp/src/rclcpp/executors/events_cbg_executor/scheduler.hpp
@mergify mergify Bot added the conflicts label Sep 8, 2026
@mergify

mergify Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of c36e550 has failed:

On branch mergify/bp/jazzy/pr-3258
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit c36e550.
  (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:   rclcpp/src/rclcpp/executors/events_cbg_executor/events_cbg_executor.cpp
	modified:   rclcpp/src/rclcpp/executors/events_cbg_executor/first_in_first_out_scheduler.cpp
	modified:   rclcpp/src/rclcpp/executors/events_cbg_executor/first_in_first_out_scheduler.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp/src/rclcpp/executors/events_cbg_executor/scheduler.hpp

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

@skyegalaxy skyegalaxy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can you resolve the merge conflicts?

@skyegalaxy skyegalaxy left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

can you resolve the merge conflicts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants