rt: remove Arc from Clock #5434

carllerche · 2023-02-06T20:01:35Z

This patch removes Arc from Tokio's internal clock source. Instead of cloning Clock when needed, a reference is passed into functions that need to get the current instant.

This patch removes `Arc` from Tokio's internal clock source. Instead of cloning `Clock` when needed, a reference is passed into functions that need to get the current instant.

Darksonn

LGTM.

hawkw

looks good when clippy passes!

carllerche · 2023-02-06T22:25:23Z

@Darksonn @hawkw I had to change how this was implemented to get tests to pass. We need to maintain #[track_caller], which means we can't panic in closures. I had the inner functions return Result and panic outside of the closure.

# 1.26.0 (March 1st, 2023) ### Fixed - sync: don't leak tracing spans in mutex guards ([#5469]) - sync: drop wakers after unlocking the mutex in Notify ([#5471]) - sync: drop wakers outside lock in semaphore ([#5475]) - macros: fix empty `join!` and `try_join!` ([#5504]) ### Added - fs: add `fs::try_exists` ([#4299]) - net: add types for named unix pipes ([#5351]) - sync: add `MappedOwnedMutexGuard` ([#5474]) ### Documented - task: clarify what happens to spawned work during runtime shutdown ([#5394]) - task: clarify `process::Command` docs (#5406) ([#5413]) - sync: add doc aliases for `blocking_*` methods ([#5448]) - task: fix wording with 'unsend' ([#5452]) - signal: updated Documentation for Signals ([#5459]) - sync: fix docs for Send/Sync bounds in broadcast ([#5480]) - io: improve AsyncFd example ([#5481]) - tokio: document supported platforms ([#5483]) - runtime: document the nature of the main future ([#5494]) - sync: document drop behavior for channels ([#5497]) - time: document immediate completion guarantee for timeouts ([#5509]) - runtime: remove extra period in docs ([#5511]) ### Changed - net: use Message Read Mode for named pipes ([#5350]) - chore: update windows-sys to 0.45 ([#5386]) - sync: mark lock guards with `#[clippy::has_significant_drop]` ([#5422]) - sync: reduce contention in watch channel ([#5464]) - time: remove cache padding in timer entries ([#5468]) - time: Improve `Instant::now()` perf with test-util ([#5513]) ### Internal Changes - tests: port proptest fuzz harnesses to use cargo-fuzz ([#5392]) - time: don't store deadline twice in sleep entries ([#5410]) - rt: remove Arc from Clock ([#5434]) - sync: make `notify_waiters` calls atomic ([#5458]) - net: refactor named pipe builders to not use bitfields ([#5477]) - io: use `poll_fn` in `copy_bidirectional` ([#5486]) - fs: add more tests for filesystem functionality ([#5493]) - net: fix test compilation failure ([#5506]) - io: ignore SplitByUtf8BoundaryIfWindows test on miri ([#5507]) ### Unstable - metrics: add a new metric for budget exhaustion yields ([#5517]) [#4299]: #4299 [#5350]: #5350 [#5351]: #5351 [#5386]: #5386 [#5392]: #5392 [#5394]: #5394 [#5410]: #5410 [#5413]: #5413 [#5422]: #5422 [#5434]: #5434 [#5448]: #5448 [#5452]: #5452 [#5458]: #5458 [#5459]: #5459 [#5464]: #5464 [#5468]: #5468 [#5469]: #5469 [#5471]: #5471 [#5474]: #5474 [#5475]: #5475 [#5477]: #5477 [#5480]: #5480 [#5481]: #5481 [#5483]: #5483 [#5486]: #5486 [#5493]: #5493 [#5494]: #5494 [#5497]: #5497 [#5504]: #5504 [#5506]: #5506 [#5507]: #5507 [#5509]: #5509 [#5511]: #5511 [#5513]: #5513 [#5517]: #5517

# 1.26.0 (March 1st, 2023) ### Fixed - macros: fix empty `join!` and `try_join!` ([#5504]) - sync: don't leak tracing spans in mutex guards ([#5469]) - sync: drop wakers after unlocking the mutex in Notify ([#5471]) - sync: drop wakers outside lock in semaphore ([#5475]) ### Added - fs: add `fs::try_exists` ([#4299]) - net: add types for named unix pipes ([#5351]) - sync: add `MappedOwnedMutexGuard` ([#5474]) ### Changed - chore: update windows-sys to 0.45 ([#5386]) - net: use Message Read Mode for named pipes ([#5350]) - sync: mark lock guards with `#[clippy::has_significant_drop]` ([#5422]) - sync: reduce contention in watch channel ([#5464]) - time: remove cache padding in timer entries ([#5468]) - time: Improve `Instant::now()` perf with test-util ([#5513]) ### Internal Changes - io: use `poll_fn` in `copy_bidirectional` ([#5486]) - net: refactor named pipe builders to not use bitfields ([#5477]) - rt: remove Arc from Clock ([#5434]) - sync: make `notify_waiters` calls atomic ([#5458]) - time: don't store deadline twice in sleep entries ([#5410]) ### Unstable - metrics: add a new metric for budget exhaustion yields ([#5517]) ### Documented - io: improve AsyncFd example ([#5481]) - runtime: document the nature of the main future ([#5494]) - runtime: remove extra period in docs ([#5511]) - signal: updated Documentation for Signals ([#5459]) - sync: add doc aliases for `blocking_*` methods ([#5448]) - sync: fix docs for Send/Sync bounds in broadcast ([#5480]) - sync: document drop behavior for channels ([#5497]) - task: clarify what happens to spawned work during runtime shutdown ([#5394]) - task: clarify `process::Command` docs ([#5413]) - task: fix wording with 'unsend' ([#5452]) - time: document immediate completion guarantee for timeouts ([#5509]) - tokio: document supported platforms ([#5483]) [#4299]: #4299 [#5350]: #5350 [#5351]: #5351 [#5386]: #5386 [#5394]: #5394 [#5410]: #5410 [#5413]: #5413 [#5422]: #5422 [#5434]: #5434 [#5448]: #5448 [#5452]: #5452 [#5458]: #5458 [#5459]: #5459 [#5464]: #5464 [#5468]: #5468 [#5469]: #5469 [#5471]: #5471 [#5474]: #5474 [#5475]: #5475 [#5477]: #5477 [#5480]: #5480 [#5481]: #5481 [#5483]: #5483 [#5486]: #5486 [#5494]: #5494 [#5497]: #5497 [#5504]: #5504 [#5509]: #5509 [#5511]: #5511 [#5513]: #5513 [#5517]: #5517

This drop was firstly introduced by [tokio-rs#3289], and the next line invokes `panic!`. In [tokio-rs#5434], the original `panic!` was replaced with `return Err`, so dropping it explicitly is no longer necessary. [tokio-rs#3289]: tokio-rs#3289

This drop was firstly introduced by [tokio-rs#3289], and the next line invokes `panic!`. In [tokio-rs#5434], the original `panic!` was replaced with `return Err`, so dropping it explicitly is no longer necessary. [tokio-rs#3289]: tokio-rs#3289 [tokio-rs#5434]: tokio-rs#5434

This drop was firstly introduced by [#3289], and the next line invokes `panic!`. In [#5434], the original `panic!` was replaced with `return Err`, so dropping it explicitly is no longer necessary. [#3289]: #3289 [#5434]: #5434

rt: remove Arc from Clock

24a7d93

This patch removes `Arc` from Tokio's internal clock source. Instead of cloning `Clock` when needed, a reference is passed into functions that need to get the current instant.

carllerche added C-maintenance Category: PRs that clean code up or issues documenting cleanup. A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime M-time Module: tokio/time labels Feb 6, 2023

github-actions bot added the R-loom Run loom tests on this PR label Feb 6, 2023

Darksonn approved these changes Feb 6, 2023

View reviewed changes

carllerche added 4 commits February 6, 2023 12:16

fix unit tests

3bb4ced

fix tests, maybe

24cf151

fix clippy

491e3be

try again

c0bf43f

hawkw approved these changes Feb 6, 2023

View reviewed changes

carllerche added 2 commits February 6, 2023 13:52

no panic in closures

2dfe45a

Merge branch 'master' into rm-arc-from-clock

dba7371

Darksonn approved these changes Feb 6, 2023

View reviewed changes

carllerche merged commit abf5d28 into master Feb 7, 2023

carllerche deleted the rm-arc-from-clock branch February 7, 2023 17:45

Noah-Kennedy mentioned this pull request Mar 1, 2023

chore: prepare for Tokio v1.26.0 release #5521

Merged

dependabot bot mentioned this pull request Apr 16, 2025

Bump the cargo group across 1 directory with 7 updates hamed210/solana-security-txt#1

Open

This was referenced May 5, 2025

Bump the cargo group across 1 directory with 7 updates offsoc/rsmaker#2

Merged

Bump the cargo group across 1 directory with 7 updates draghtnight/solana-security-txt#1

Open

ADD-SP mentioned this pull request May 11, 2025

time: remove outdated explicit drop call of Mutex #7326

Merged

This was referenced May 26, 2025

Bump the cargo group across 1 directory with 7 updates SbruiceS/static-analysis#1

Open

⬆️ Bump tokio from 1.21.2 to 1.26.0 in the cargo group across 1 directory fedepujol/nvim-completion#1

Open

dependabot bot mentioned this pull request Jun 3, 2025

build(deps): bump the cargo group across 2 directories with 8 updates AKJUS/attestation-agent#1

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

rt: remove Arc from Clock #5434

rt: remove Arc from Clock #5434

Uh oh!

carllerche commented Feb 6, 2023

Uh oh!

Darksonn left a comment

Uh oh!

hawkw left a comment

Uh oh!

carllerche commented Feb 6, 2023

Uh oh!

Uh oh!

Uh oh!

rt: remove Arc from Clock #5434

rt: remove Arc from Clock #5434

Uh oh!

Conversation

carllerche commented Feb 6, 2023

Uh oh!

Darksonn left a comment

Choose a reason for hiding this comment

Uh oh!

hawkw left a comment

Choose a reason for hiding this comment

Uh oh!

carllerche commented Feb 6, 2023

Uh oh!

Uh oh!