[WIP] time: delay the cancellation of timers #7467
Draft
+1,003
−1,203
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ADD-SP
added
A-tokio
ADD-SP
force-pushed
the
add_sp/time-local-wheel
branch
11 times, most recently
from
c2d5790 to
d04c22f
Compare
ADD-SP
changed the title
ADD-SP
commented
Jul 19, 2025
| @@ -522,43 +514,6 @@ async fn insert_after_ready_poll() { | |||
| assert_eq!("3", res[2]); | |||
| } | |||
|
|
|||
| #[tokio::test] | |||
| async fn reset_later_after_slot_starts() { | |||
There was a problem hiding this comment.
Note
This test was removed because it was testing the behavior of tokio::runtime::time::entry::reset, which is removed in this PR.
ADD-SP
commented
Jul 19, 2025
| @@ -584,43 +539,6 @@ async fn reset_inserted_expired() { | |||
| assert_eq!(queue.len(), 0); | |||
| } | |||
|
|
|||
| #[tokio::test] | |||
| async fn reset_earlier_after_slot_starts() { | |||
There was a problem hiding this comment.
Note
This test was removed because it was testing the behavior of tokio::runtime::time::entry::reset, which is removed in this PR.
ADD-SP
commented
Jul 19, 2025
| @@ -221,7 +219,7 @@ async fn reset_much_later() { | |||
|
|
|||
| sleep(ms(20)).await; | |||
|
|
|||
| assert!(queue.is_woken()); | |||
| assert_ready_some!(poll!(queue)); | |||
There was a problem hiding this comment.
Note
Since previous queue.reset_at doesn't register the underlying timer, so the task won't be woken up, we have to poll the queue.
ADD-SP
commented
Jul 19, 2025
| @@ -248,7 +246,7 @@ async fn reset_twice() { | |||
|
|
|||
| sleep(ms(20)).await; | |||
|
|
|||
| assert!(queue.is_woken()); | |||
| assert_ready_some!(poll!(queue)); | |||
There was a problem hiding this comment.
Note
Since previous queue.reset_at doesn't register the underlying timer, so the task won't be woken up, we have to poll the queue.
ADD-SP
commented
Jul 19, 2025
Comment on lines
+771
to
+779
| // runtime is shutting down | ||
| // OR waking up expired timers | ||
|
|
||
| // Track that a task was scheduled from **outside** of the runtime. | ||
| self.shared.scheduler_metrics.inc_remote_schedule_count(); | ||
|
|
||
| // Schedule the task | ||
| self.shared.inject.push(task); | ||
| self.driver.unpark(); |
There was a problem hiding this comment.
Note
Since the wheel is stored in the Core, the cx.core is None while waking up timers.
Although we can store Option<Wheel> in Core, it doubles the number of states of the local time subsystem.
ADD-SP
commented
Jul 19, 2025
ADD-SP
force-pushed
the
add_sp/time-local-wheel
branch
2 times, most recently
from
695eea8 to
e9255ee
Compare
ADD-SP
commented
Jul 20, 2025
| @@ -41,7 +39,6 @@ mod wake_list; | |||
| feature = "fs", | |||
| feature = "rt", | |||
| feature = "signal", | |||
| feature = "time", | |||
| ))] | |||
| pub(crate) use wake_list::WakeList; | |||
There was a problem hiding this comment.
Note
We no long use WakeList in the time subsystem.
ADD-SP
commented
Jul 20, 2025
Comment on lines
+137
to
+138
| // #[cfg(test)] | ||
| // mod tests; |
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
ADD-SP
force-pushed
the
add_sp/time-local-wheel
branch
from
e9255ee to
64b138e
Compare
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
There are something need to be polished, but before polishing something, I drafted this PR to get the CI error early.
tokio/src/runtime/time/tests/mod.rs(blocked by time: delay theArc::cloneuntil registering timer #7473).Review guide
Rationale for some technical decisions
Please checkout the inline PR comments I wrote.
Benchmarks
Waiting for #7473.