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

[ros2_control_node] Add option to set the CPU affinity (backport #1852) #1856

Merged
merged 4 commits into from
Nov 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 5, 2024

This PR adds an option to the ros2_control_node to be able to set the CPU affinity to bind it to a specific CPU Core. By default, this is not enabled, unless it is specifically set


This is an automatic backport of pull request #1852 done by Mergify.

(cherry picked from commit 98f0795)

# Conflicts:
#	doc/release_notes.rst
Copy link
Contributor Author

mergify bot commented Nov 5, 2024

Cherry-pick of 98f0795 has failed:

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

You are currently cherry-picking commit 98f0795.
  (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:   controller_manager/src/ros2_control_node.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/release_notes.rst

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

@mergify mergify bot added the conflicts label Nov 5, 2024
@saikishor
Copy link
Member

saikishor commented Nov 5, 2024

Needs to be merged after #1850

Copy link

codecov bot commented Nov 5, 2024

Codecov Report

Attention: Patch coverage is 16.66667% with 5 lines in your changes missing coverage. Please review.

Project coverage is 62.48%. Comparing base (4a3daec) to head (ebcae91).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
controller_manager/src/ros2_control_node.cpp 16.66% 4 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1856      +/-   ##
==========================================
- Coverage   62.50%   62.48%   -0.03%     
==========================================
  Files         108      108              
  Lines       12160    12166       +6     
  Branches     8250     8252       +2     
==========================================
+ Hits         7601     7602       +1     
- Misses        879      883       +4     
- Partials     3680     3681       +1     
Flag Coverage Δ
unittests 62.48% <16.66%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
controller_manager/src/ros2_control_node.cpp 68.88% <16.66%> (-8.04%) ⬇️

Copy link
Contributor Author

mergify bot commented Nov 5, 2024

This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

@bmagyar
Copy link
Member

bmagyar commented Nov 5, 2024

@mergify rebase

Copy link
Contributor Author

mergify bot commented Nov 5, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • #commits > 1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@bmagyar bmagyar removed the conflicts label Nov 5, 2024
@bmagyar bmagyar merged commit d91c155 into humble Nov 5, 2024
6 of 11 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-1852 branch November 5, 2024 12:26
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