Skip to content

Commit 377c4ef

Browse files
sadmac7000Rebase bot
authored and
Rebase bot
committed
[rust-3p] Patch wakeup bug in async-io crate
This just adds smol-rs/async-io#79 to our distribution of async-io, as we've seen issues in infra like the one reported there. Bug: 47531 Bug: 126159 Change-Id: I393f35c131b9737ee8f5043b72162b6c3bf98dfb Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/871506 Reviewed-by: Adam Perry <[email protected]>
1 parent 585b5bd commit 377c4ef

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

third_party/rust_crates/forks/async-io/README.fuchsia

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ Description:
44

55
async-io is used only on the host side to provide async usage of *nix IO primitives.
66

7-
This is mainline, but will soon incorporate the patch from
8-
https://github.com/smol-rs/async-io/pull/79/commits/71cd97d34ed8c652074b61ed4093b475e2fb4fdd
9-
.
7+
This is mainline with the patch from https://github.com/smol-rs/async-io/pull/79/commits/71cd97d34ed8c652074b61ed4093b475e2fb4fdd included.
108

11-
This will be async-io mainline (~1.12.0) with a patch.
9+
This is async-io mainline (~1.12.0) with a patch.
1210

1311
There is nothing else special about this release the fork is cut from mainline.
1412

third_party/rust_crates/forks/async-io/src/reactor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ impl Source {
432432
panic::catch_unwind(|| w.wake()).ok();
433433
}
434434
state[dir].waker = Some(cx.waker().clone());
435-
state[dir].ticks = Some((Reactor::get().ticker(), state[dir].tick));
435+
state[dir].ticks = Some((state[dir].tick, 0));
436436

437437
// Update interest in this I/O handle.
438438
if was_empty {

0 commit comments

Comments
 (0)