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

Reset coop budget when blocking in block_on #2711

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Conversation

jonhoo
Copy link
Contributor

@jonhoo jonhoo commented Jul 28, 2020

Previously, we would fail to reset the coop budget in this case, making
it so that coop::poll_proceed would perpetually yield Poll::Pending
in nested executers even when run in block_in_place.

This is also a further improvement on #2645.

Previously, we would fail to reset the coop budget in this case, making
it so that `coop::poll_proceed` would perpetually yield `Poll::Pending`
in nested executers even when run in `block_in_place`.

This is also a further improvement on #2645.
@jonhoo jonhoo requested a review from carllerche July 28, 2020 21:56
Copy link
Member

@hawkw hawkw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

tokio/tests/task_blocking.rs Show resolved Hide resolved
@carllerche
Copy link
Member

looks like CI failed.

@jonhoo
Copy link
Contributor Author

jonhoo commented Jul 28, 2020

Bah, clippy...

@jonhoo jonhoo merged commit 0366a3e into master Jul 28, 2020
@jonhoo jonhoo deleted the coop-in-blocking-block-on branch July 28, 2020 23:58
jonhoo added a commit to mit-pdos/noria that referenced this pull request Jul 28, 2020
@Darksonn Darksonn mentioned this pull request Nov 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants