Skip to content
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.

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

time: revert "time: avoid traversing entries in the time wheel twice" #6715

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

Darksonn
Copy link
Contributor

@Darksonn Darksonn commented Jul 23, 2024

This reverts #6584.

Fixes: #6714

@Darksonn Darksonn added A-tokio Area: The main tokio crate M-time Module: tokio/time labels Jul 23, 2024
@github-actions github-actions bot added the R-loom-time-driver Run loom time driver tests on this PR label Jul 23, 2024
@Darksonn Darksonn enabled auto-merge (squash) July 23, 2024 16:03
@Darksonn Darksonn merged commit 47210a8 into master Jul 23, 2024
77 checks passed
@Darksonn Darksonn deleted the alice/revert-for-1.39.1 branch July 23, 2024 16:09
kodiakhq bot pushed a commit to pdylanross/fatigue that referenced this pull request Jul 24, 2024
Bumps tokio from 1.38.1 to 1.39.1.

Release notes
Sourced from tokio's releases.

Tokio v1.39.1
1.39.1 (July 23rd, 2024)
This release reverts "time: avoid traversing entries in the time wheel twice" because it contains a bug. (#6715)
#6715: tokio-rs/tokio#6715
Tokio v1.39.0
1.39.0 (July 23rd, 2024)

This release bumps the MSRV to 1.70. (#6645)
This release upgrades to mio v1. (#6635)
This release upgrades to windows-sys v0.52 (#6154)

Added

io: implement AsyncSeek for Empty (#6663)
metrics: stabilize num_alive_tasks (#6619, #6667)
process: add Command::as_std_mut (#6608)
sync: add watch::Sender::same_channel (#6637)
sync: add {Receiver,UnboundedReceiver}::{sender_strong_count,sender_weak_count} (#6661)
sync: implement Default for watch::Sender (#6626)
task: implement Clone for AbortHandle (#6621)
task: stabilize consume_budget (#6622)

Changed

io: improve panic message of ReadBuf::put_slice() (#6629)
io: read during write in copy_bidirectional and copy (#6532)
runtime: replace num_cpus with available_parallelism (#6709)
task: avoid stack overflow when passing large future to block_on (#6692)
time: avoid traversing entries in the time wheel twice (#6584)
time: support IntoFuture with timeout (#6666)
macros: support IntoFuture with join! and select! (#6710)

Fixed

docs: fix docsrs builds with the fs feature enabled (#6585)
io: only use short-read optimization on known-to-be-compatible platforms (#6668)
time: fix overflow panic when using large durations with Interval (#6612)

Added (unstable)

macros: allow unhandled_panic behavior for #[tokio::main] and #[tokio::test] (#6593)
metrics: add spawned_tasks_count (#6114)
metrics: add worker_park_unpark_count (#6696)
metrics: add worker thread id (#6695)

Documented


... (truncated)


Commits

f8fe0ff chore: prepare Tokio v1.39.1 (#6716)
47210a8 time: revert "avoid traversing entries in the time wheel twice" (#6715)
29545d9 runtime: ignore many_oneshot_futures test for alt scheduler (#6712)
48e35c1 chore: release Tokio v1.39.0 (#6711)
dd1d371 macros: accept IntoFuture args for macros (#6710)
6a1a7b1 chore: prepare tokio-macros v2.4.0 (#6707)
51b03f0 deps: update to windows-sys v0.52 (#6154)
754a1fb deps: update to Mio v1 (#6635)
90b23a9 metrics: add worker thread id (#6695)
b69f16a metrics: add worker_park_unpark_count (#6696)
Additional commits viewable in compare view




Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
wathenjiang added a commit to wathenjiang/tokio that referenced this pull request Jul 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate M-time Module: tokio/time R-loom-time-driver Run loom time driver tests on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.39.0 breaks quinn: linked_list.rs panic
2 participants