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 rclc_example: memory leaking in msg.data allocation (backport #386) #387

Merged
merged 2 commits into from
Aug 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2023

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


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

Signed-off-by: zhangtonghe <[email protected]>
Co-authored-by: zhangtonghe <[email protected]>
(cherry picked from commit 7af2054)
@Zard-C
Copy link
Contributor

Zard-C commented Aug 4, 2023

https://build.ros2.org/job/Rpr__rclc__ubuntu_jammy_amd64/163/clang-tidy/new/folder.-84953004/
It seems that clang-tidy does not pass the check, due to ‘rcl_timer_init’ is deprecated: Call rcl_timer_init2 instead

Copy link
Contributor

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

this fix is not related to https://build.ros2.org/job/Rpr__rclc__ubuntu_jammy_amd64/163/clang-tidy/new/folder.-84953004/category.2119183113/. but as mentioned here, tick-tock deprecate introduced on ros2/rcl#1004 leads to this warning.

* fix: deprecated rcl_timer_init

Signed-off-by: Zard-C <[email protected]>
Signed-off-by: zhangtonghe <[email protected]>
Signed-off-by: Zard-C <[email protected]>

* fix: switch rcl_timer_init to rcl_timer_init2

Signed-off-by: Zard-C <[email protected]>
Signed-off-by: zhangtonghe <[email protected]>
Signed-off-by: Zard-C <[email protected]>

* update rclc_timer_init_default and it's invokation

Signed-off-by: zhangtonghe <[email protected]>
Signed-off-by: Zard-C <[email protected]>

* Revert "update rclc_timer_init_default and it's invokation"

This reverts commit ebc3edb.

Signed-off-by: zhangtonghe <[email protected]>
Signed-off-by: Zard-C <[email protected]>

* fix: rcl_timer_init usage

Combined changes from multiple commits to refactor the usage of rcl_timer_init for better compatibility and clarity.

Signed-off-by: Zard-C <[email protected]>
Signed-off-by: zhangtonghe <[email protected]>

* Update rclc/include/rclc/timer.h

Co-authored-by: Jan Staschulat <[email protected]>
Signed-off-by: Zard-C <[email protected]>

---------

Signed-off-by: Zard-C <[email protected]>
Signed-off-by: zhangtonghe <[email protected]>
Co-authored-by: zhangtonghe <[email protected]>
Co-authored-by: Jan Staschulat <[email protected]>
@codecov-commenter
Copy link

Codecov Report

Merging #387 (605a475) into rolling (14c2c41) will decrease coverage by 0.20%.
The diff coverage is 50.00%.

@@             Coverage Diff             @@
##           rolling     #387      +/-   ##
===========================================
- Coverage    69.63%   69.44%   -0.20%     
===========================================
  Files           16       16              
  Lines         2760     2762       +2     
  Branches       766      766              
===========================================
- Hits          1922     1918       -4     
- Misses         452      456       +4     
- Partials       386      388       +2     
Files Changed Coverage Δ
rclc/src/rclc/timer.c 58.33% <50.00%> (-11.67%) ⬇️

... and 1 file with indirect coverage changes

@JanStaschulat
Copy link
Contributor

I made DCO check pass.

@JanStaschulat JanStaschulat merged commit d263be2 into rolling Aug 22, 2023
4 checks passed
@JanStaschulat JanStaschulat deleted the mergify/bp/rolling/pr-386 branch August 22, 2023 14:16
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.

4 participants