Skip to content

schedulers: keep the waited-for top alive so its address cannot be reused #765

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
AlexInLog merged 2 commits into from
Oct 25, 2026
+8 −4
Merged

schedulers: keep the waited-for top alive so its address cannot be reused #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e55a80
schedulers: keep the waited-for top alive so its address cannot be re…
daixtrose Oct 23, 2026
c753241
Merge branch 'v2' into fix/scheduler-keep-waited-top-alive
AlexInLog Oct 24, 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
6 changes: 4 additions & 2 deletions src/rpp/rpp/schedulers/new_thread.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ namespace rpp::schedulers
{
// Sleep until the current top is due, and wake as soon as the top changes
// (an earlier schedulable was queued), so the loop recomputes the wait.
const auto* const top = state->queue.top().get();
state->cv.wait_until(lock, top->get_timepoint(), [&] { return state->queue.is_empty() || state->queue.top().get() != top || state->queue.top()->is_disposed() || worker_strategy::now() >= state->queue.top()->get_timepoint(); });
// The copy keeps the waited-for top alive, so its address cannot be reused
// by a newly queued schedulable while we wait.
const auto top = state->queue.top();
state->cv.wait_until(lock, top->get_timepoint(), [&] { return state->queue.is_empty() || state->queue.top().get() != top.get() || state->queue.top()->is_disposed() || worker_strategy::now() >= state->queue.top()->get_timepoint(); });
continue;
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/rpp/rpp/schedulers/run_loop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ namespace rpp::schedulers

// Sleep until the current top is due, and wake as soon as the top changes
// (an earlier schedulable was queued), so the loop recomputes the wait.
const auto* const top = m_queue.top().get();
m_cv.wait_until(lock, top->get_timepoint(), [&]() { return is_disposed() || m_queue.is_empty() || m_queue.top().get() != top || m_queue.top()->is_disposed() || m_queue.top()->get_timepoint() <= worker_strategy::now(); });
// The copy keeps the waited-for top alive, so its address cannot be reused
// by a newly queued schedulable while we wait.
const auto top = m_queue.top();
m_cv.wait_until(lock, top->get_timepoint(), [&]() { return is_disposed() || m_queue.is_empty() || m_queue.top().get() != top.get() || m_queue.top()->is_disposed() || m_queue.top()->get_timepoint() <= worker_strategy::now(); });
}
return {};
}
Expand Down
Loading