time: delay the cancellation of timers #7467

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

Jump to bottom

Open

ADD-SP wants to merge 67 commits into tokio-rs:master from ADD-SP:add_sp/time-local-wheel

+1,722 −1,350

Member

ADD-SP commented Jul 19, 2025 •

edited

Loading

Review guide

Please checkout RFC: Delayed cancellation of timer #7384 for high-level design.
This big patch were carefully split into several logical commits, reviewing commit-by-commit should be easier.

Design document

See https://gist.github.com/ADD-SP/4037e25256b8dc8a4956962415de2356.

Benchmarks

See https://gist.github.com/ADD-SP/4037e25256b8dc8a4956962415de2356.

ADD-SP added A-tokio M-time T-performance R-loom-time-driver R-loom-current-thread R-loom-multi-thread labels

ADD-SP changed the title ~~[WIP]~~ [WIP] time: delayed cancellation of timers

ADD-SP force-pushed the add_sp/time-local-wheel branch 11 times, most recently from c2d5790 to d04c22f Compare

July 19, 2025 13:19

ADD-SP changed the title ~~[WIP] time: delayed cancellation of timers~~ [WIP] time: delay the cancellation of timers

ADD-SP commented

View reviewed changes

tokio-util/tests/time_delay_queue.rs

    
              }

              #[tokio::test]

              async fn reset_later_after_slot_starts() {

Member Author

ADD-SP Jul 19, 2025

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

View reviewed changes

tokio-util/tests/time_delay_queue.rs

    
              }

              #[tokio::test]

              async fn reset_earlier_after_slot_starts() {

Member Author

ADD-SP Jul 19, 2025

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

View reviewed changes

tokio-util/tests/time_delay_queue.rs

    
                  sleep(ms(20)).await;

                  assert!(queue.is_woken());

                  assert_ready_some!(poll!(queue));

Member Author

ADD-SP Jul 19, 2025 •

edited

Loading

Note

queue.reset_at resets inner Sleep, however, the new implementation will drop the inner timer and create a new one. So the waker will not be called, we have to poll manually.

ADD-SP commented

View reviewed changes

tokio-util/tests/time_delay_queue.rs

    
                  sleep(ms(20)).await;

                  assert!(queue.is_woken());

                  assert_ready_some!(poll!(queue));

Member Author

ADD-SP Jul 19, 2025 •

edited

Loading

Note

queue.reset_at resets inner Sleep, however, the new implementation will drop the inner timer and create a new one. So the waker will not be called, we have to poll manually.

ADD-SP commented

View reviewed changes

tokio/src/runtime/scheduler/current_thread/mod.rs Show resolved Hide resolved

ADD-SP commented

View reviewed changes

tokio/src/runtime/scheduler/multi_thread/worker.rs Outdated Show resolved Hide resolved

ADD-SP force-pushed the add_sp/time-local-wheel branch 2 times, most recently from 695eea8 to e9255ee Compare

July 20, 2025 08:21

ADD-SP mentioned this pull request

time: delay the Arc::clone of the scheduler::Handle until registering timer #7461

Closed

ADD-SP commented

View reviewed changes

tokio/src/util/mod.rs

    
                  feature = "signal",

                  feature = "time",

              ))]

              pub(crate) use wake_list::WakeList;

Member Author

ADD-SP Jul 20, 2025

Note

We no long use WakeList in the time subsystem.

ADD-SP commented

View reviewed changes

tokio/src/runtime/time/mod.rs Outdated Show resolved Hide resolved

ADD-SP added 21 commits

September 11, 2025 22:17


          remove unnecessary PhantomData in cancellation queue

2fcfb4b

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          fix rustfmt reports

9657e6d

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          merge: sync changes from the base branch

1fff994

base is 32a1acc


          ci: fix spellcheck.dic

c208c3a

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          merge: sync changes from the base branch

fda223d

base is 5f3f5b0


          merge: sync changes from the base branch

070ddd6

base is 7c197c7


          merge: sync changes from the base branch

102e2d2

base is c6b16cc


          merge: sync changes from the base branch

5d17c33

base is 67869be


          merge: sync changes from the base branch

a17bdde

base is 2af3e44


          improve the ergonomic of Handle::with_wheel()

40cc384

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          merge: sync changes from the base branch

36e71a0

base is eb99e47


          merge: sync changes from the base branch

a5c384d

base is bce76c5


          merge: sync changes from the base branch

ebd1df1

base is 8ccf2fb


          merge: sync changes from the base branch

029da48

base is 1a4cf31


          simplify tokio/src/runtime/time/timer.rs

81e57c9

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          fixup! eliminate atomic state by Mutex<State> of Entry

9b5a90c


          push timer tasks into local queue instead of global queue

4862ef7

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>


          merge: sync changes from the base branch

89f5968

base is ffcc9f7


          fixup! simplify tokio/src/runtime/time/timer.rs

b3c14ea


          fixup! push timer tasks into local queue instead of global queue

2aafc92


          fix spellcheck.dic

aec80f9

Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>

ADD-SP commented

View reviewed changes

tokio/src/runtime/time/mod.rs

    
                      drop(lock);

                      waker_list.wake_all();

                  pub(crate) struct Context2 {

Member Author

ADD-SP Oct 6, 2025

Note

Bad name, feel free to suggest a new one.

ADD-SP added 5 commits

October 6, 2025 20:56


          fixup! push timer tasks into local queue instead of global queue

8bb88bc


          fixup! push timer tasks into local queue instead of global queue

0b086ec


          fixup! push timer tasks into local queue instead of global queue

35be1b9


          merge: sync changes from the base branch

348fc25

base is 9255d96


          fixup! eliminate atomic state by Mutex<State> of Entry

d00f247

samugi mentioned this pull request

runtime: clarify the behavior of Handle::block_on #7665

Merged

ADD-SP added 2 commits

October 8, 2025 18:36


          fixup! eliminate atomic state by Mutex<State> of Entry

c5eeb3d


          cleanup the Context::park_internal

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

Labels

A-tokio M-time R-loom-current-thread R-loom-multi-thread R-loom-time-driver T-performance