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.

Sign up for GitHub

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

Jump to bottom

rt: fix nesting block_in_place with block_on #5837

Merged
merged 2 commits into from
Jun 29, 2023
Merged

rt: fix nesting block_in_place with block_on #5837

merged 2 commits into from
Jun 29, 2023

Commits on Jun 29, 2023

  1. rt: fix nesting block_in_place with block_on 

    This patch fixes a bug where nesting `block_in_place` with a `block_on`
between could lead to a panic. This happened because the nested
`block_in_place` would try to acquire a core on return when it should
not attempt to do so. The `block_on` between the two nested
`block_in_place` altered the thread-local state to lead to the incorrect
behavior.

The fix is for each call to `block_in_place` to track if it needs to try
to steal a core back.

Fixes #5239
    @carllerche
    carllerche committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    7dc3e43 View commit details
    Browse the repository at this point in the history

  2. fmt

    @carllerche
    carllerche committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    73136d7 View commit details
    Browse the repository at this point in the history