Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions rclcpp_async/include/rclcpp_async/co_context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,11 @@ inline void Event::WaitAwaiter::await_suspend(std::coroutine_handle<> h)
inline void Event::set()
{
set_ = true;
while (!waiters_.empty()) {
auto w = waiters_.front();
waiters_.pop();
std::queue<Waiter> pending;
pending.swap(waiters_);
while (!pending.empty()) {
auto w = pending.front();
pending.pop();
if (*w.active) {
*w.active = false;
ctx_.resume(w.handle);
Expand Down
46 changes: 46 additions & 0 deletions rclcpp_async/test/test_event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,52 @@ TEST_F(EventTest, CancelDuringWait)
EXPECT_TRUE(was_cancelled);
}

TEST_F(EventTest, SetDoesNotLoopWhenWaiterReregisters)
{
// Reproduces the re-entrant infinite loop bug:
// 1. set() resumes a waiter synchronously
// 2. The waiter checks a condition, finds it unsatisfied, calls clear() + wait()
// 3. wait() re-registers a waiter in waiters_
// 4. set() sees waiters_ is non-empty and loops forever

Event event(*ctx_);
int value = 0;
int resume_count = 0;

auto consumer = [&]() -> Task<void> {
while (value != 42) {
event.clear();
co_await event.wait();
resume_count++;
}
};

auto consumer_task = ctx_->create_task(consumer());

// Spin to let consumer suspend on wait()
for (int i = 0; i < 10; i++) {
executor_.spin_some();
std::this_thread::sleep_for(1ms);
}
EXPECT_EQ(resume_count, 0);

// set() with wrong value — consumer will clear + re-wait.
// With the bug, this never returns (infinite loop).
value = 1;
event.set();

// If we get here, set() returned. The consumer should have been resumed once.
EXPECT_EQ(resume_count, 1);

// Now satisfy the condition
value = 42;
event.set();
spin_until_done(consumer_task);

ASSERT_TRUE(consumer_task.handle.done());
EXPECT_EQ(resume_count, 2);
}

TEST_F(EventTest, CancelDoesNotDoubleResume)
{
Event event(*ctx_);
Expand Down
Loading