Skip to content

Fix incorrect internal clear inside RingBufferImplementation #3116

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.

Sign up for GitHub

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

Merged
InvincibleRMC merged 6 commits into from
Apr 2, 2026
+36 −1
Merged

Fix incorrect internal clear inside RingBufferImplementation #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b9be60
Don't call clear on backing data structure
InvincibleRMC Mar 30, 2026
a166d89
Add destructive test
InvincibleRMC Mar 31, 2026
c54efb5
Add default
InvincibleRMC Apr 1, 2026
7f0b773
Add default
InvincibleRMC Apr 1, 2026
0079c43
Lint
InvincibleRMC Apr 1, 2026
6ddd673
Change check for msvc
InvincibleRMC Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rclcpp/include/rclcpp/experimental/buffers/ring_buffer_implementation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ class RingBufferImplementation : public BufferImplementationBase<BufferT>

inline void clear_()
{
ring_buffer_.clear();
size_ = 0;
read_index_ = 0;
write_index_ = capacity_ - 1;
Expand Down
36 changes: 36 additions & 0 deletions rclcpp/test/rclcpp/test_ring_buffer_implementation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,42 @@ TEST(TestRingBufferImplementation, test_buffer_clear) {
EXPECT_EQ('d', d);
}

namespace detail
{

struct Tracked
{
inline static int destroyed = 0;
int value;

Tracked()
: value(0) {}
explicit Tracked(int v)
: value(v) {}
~Tracked() {destroyed++;}
};
} // namespace detail

TEST(TestRingBufferImplementation, clear_is_non_destructive)
{
detail::Tracked::destroyed = 0;

rclcpp::experimental::buffers::RingBufferImplementation<detail::Tracked> rb(2);

rb.enqueue(detail::Tracked(1));
rb.enqueue(detail::Tracked(2));

detail::Tracked::destroyed = 0;

rb.clear();

EXPECT_EQ(detail::Tracked::destroyed, 0);

// Outside buffer should be removed
rb.enqueue(detail::Tracked(3));
EXPECT_GE(detail::Tracked::destroyed, 1);
}

TEST(TestRingBufferImplementation, handle_nullptr_deletion) {
rclcpp::experimental::buffers::RingBufferImplementation<std::unique_ptr<int>> rb(3);
rb.enqueue(std::make_unique<int>(42));
Expand Down