mirror of
https://github.com/tokio-rs/tokio.git
synced 2025-10-01 12:20:39 +00:00
rt: rm coop::budget from LocalSet::run_until
(#5155)
The `LocalSet::run_until` future is just a "plain" future that should run on a runtime that already has a coop budget. In other words, the `run_until` future should not get its own budget but should inherit the calling task's budget. Getting this behavior is done by removing the call to `budget` in `run_until`.
This commit is contained in:
parent
a051ed726f
commit
ca8e176ce9
@ -893,7 +893,7 @@ impl<T: Future> Future for RunUntil<'_, T> {
|
||||
let _no_blocking = crate::runtime::enter::disallow_block_in_place();
|
||||
let f = me.future;
|
||||
|
||||
if let Poll::Ready(output) = crate::runtime::coop::budget(|| f.poll(cx)) {
|
||||
if let Poll::Ready(output) = f.poll(cx) {
|
||||
return Poll::Ready(output);
|
||||
}
|
||||
|
||||
|
@ -587,6 +587,56 @@ mod unstable {
|
||||
})
|
||||
.await;
|
||||
}
|
||||
|
||||
// This test compares that, when the task driving `run_until` has already
|
||||
// consumed budget, the `run_until` future has less budget than a "spawned"
|
||||
// task.
|
||||
//
|
||||
// "Budget" is a fuzzy metric as the Tokio runtime is able to change values
|
||||
// internally. This is why the test uses indirection to test this.
|
||||
#[tokio::test]
|
||||
async fn run_until_does_not_get_own_budget() {
|
||||
// Consume some budget
|
||||
tokio::task::consume_budget().await;
|
||||
|
||||
LocalSet::new()
|
||||
.run_until(async {
|
||||
let spawned = tokio::spawn(async {
|
||||
let mut spawned_n = 0;
|
||||
|
||||
{
|
||||
let mut spawned = tokio_test::task::spawn(async {
|
||||
loop {
|
||||
spawned_n += 1;
|
||||
tokio::task::consume_budget().await;
|
||||
}
|
||||
});
|
||||
// Poll once
|
||||
assert!(!spawned.poll().is_ready());
|
||||
}
|
||||
|
||||
spawned_n
|
||||
});
|
||||
|
||||
let mut run_until_n = 0;
|
||||
{
|
||||
let mut run_until = tokio_test::task::spawn(async {
|
||||
loop {
|
||||
run_until_n += 1;
|
||||
tokio::task::consume_budget().await;
|
||||
}
|
||||
});
|
||||
// Poll once
|
||||
assert!(!run_until.poll().is_ready());
|
||||
}
|
||||
|
||||
let spawned_n = spawned.await.unwrap();
|
||||
assert_ne!(spawned_n, 0);
|
||||
assert_ne!(run_until_n, 0);
|
||||
assert!(spawned_n > run_until_n);
|
||||
})
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
fn rt() -> runtime::Runtime {
|
||||
|
Loading…
x
Reference in New Issue
Block a user